13 files changed, 217 insertions, 123 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index e416d05..eb5c0f5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3493,9 +3493,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 ani.AnimationList[i].AnimSequenceID = seqs[i];
 
                 ani.AnimationSourceList[i] = new AvatarAnimationPacket.AnimationSourceListBlock();
-                ani.AnimationSourceList[i].ObjectID = objectIDs[i];
-                if (objectIDs[i] == UUID.Zero)
-                    ani.AnimationSourceList[i].ObjectID = sourceAgentId;
+                if (objectIDs[i].Equals(sourceAgentId))
+                    ani.AnimationSourceList[i].ObjectID = UUID.Zero;
+                else
+                    ani.AnimationSourceList[i].ObjectID = objectIDs[i];
             }
             ani.Header.Reliable = false;
             OutPacket(ani, ThrottleOutPacketType.Task);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 6985449..f969bc3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -585,8 +585,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             // Stats tracking
             Interlocked.Increment(ref udpClient.PacketsSent);
-            if (isReliable)
-                Interlocked.Add(ref udpClient.UnackedBytes, outgoingPacket.Buffer.DataLength);
 
             // Put the UDP payload on the wire
             AsyncBeginSend(buffer);
@@ -859,9 +857,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Acknowledge the UseCircuitCode packet
             SendAckImmediate(remoteEndPoint, packet.Header.Sequence);
             
-            m_log.DebugFormat(
-                "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", 
-                buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
+//            m_log.DebugFormat(
+//                "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", 
+//                buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
         }
 
         private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
index 4cb4aee..9d40688 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
+using System.Threading;
 using OpenMetaverse;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
@@ -77,6 +78,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void Add(OutgoingPacket packet)
         {
             m_pendingAdds.Enqueue(packet);
+            Interlocked.Add(ref packet.Client.UnackedBytes, packet.Buffer.DataLength);            
         }
 
         /// <summary>
@@ -139,46 +141,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private void ProcessQueues()
         {
             // Process all the pending adds
-
             OutgoingPacket pendingAdd;
-            if (m_pendingAdds != null)
-            {
-                while (m_pendingAdds.TryDequeue(out pendingAdd))
-                {
-                    if (pendingAdd != null && m_packets != null)
-                    {
-                        m_packets[pendingAdd.SequenceNumber] = pendingAdd;
-                    }
-                }
-            }
+            while (m_pendingAdds.TryDequeue(out pendingAdd))
+                m_packets[pendingAdd.SequenceNumber] = pendingAdd;
             
             // Process all the pending removes, including updating statistics and round-trip times
             PendingAck pendingRemove;
             OutgoingPacket ackedPacket;
-            if (m_pendingRemoves != null)
+            while (m_pendingRemoves.TryDequeue(out pendingRemove))
             {
-                while (m_pendingRemoves.TryDequeue(out pendingRemove))
+                if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket))
                 {
-                    if (m_pendingRemoves != null && m_packets != null)
+                    m_packets.Remove(pendingRemove.SequenceNumber);
+
+                    // Update stats
+                    Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength);
+
+                    if (!pendingRemove.FromResend)
                     {
-                        if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket))
-                        {
-                            m_packets.Remove(pendingRemove.SequenceNumber);
-
-                            // Update stats
-                            System.Threading.Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength);
-
-                            if (!pendingRemove.FromResend)
-                            {
-                                // Calculate the round-trip time for this packet and its ACK
-                                int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount;
-                                if (rtt > 0)
-                                    ackedPacket.Client.UpdateRoundTrip(rtt);
-                            }
-                        }
+                        // Calculate the round-trip time for this packet and its ACK
+                        int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount;
+                        if (rtt > 0)
+                            ackedPacket.Client.UpdateRoundTrip(rtt);
                     }
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
index 36aaab3..8347e35 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
         {
             UUID capID = UUID.Random();
 
-            m_log.Info("[GETMESH]: /CAPS/" + capID);
+//            m_log.Info("[GETMESH]: /CAPS/" + capID);
             caps.RegisterHandler("GetMesh",
                                  new RestHTTPHandler("GET", "/CAPS/" + capID,
                                                        delegate(Hashtable m_dhttpMethod)
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
index 1f60e36..6fb8b46 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
         {
             UUID capID = UUID.Random();
 
-            m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
+//            m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
             caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
         }
 
@@ -171,7 +171,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
         /// <returns>False for "caller try another codec"; true otherwise</returns>
         private bool FetchTexture(OSHttpRequest httpRequest, OSHttpResponse httpResponse, UUID textureID, string format)
         {
-            m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
+//            m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
             AssetBase texture;
 
             string fullID = textureID.ToString();
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 7303fe7..7df2beb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
             item = invService.GetItem(item);
             if (item != null)
             {
-                item.Flags = 1;
+                item.Flags |= 1;
                 invService.UpdateItem(item);
             }
             else 
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
             item = invService.GetItem(item);
             if (item != null)
             {
-                item.Flags = 0;
+                item.Flags &= ~(uint)1;
                 invService.UpdateItem(item);
             }
             else 
@@ -93,4 +93,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
                     "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 5ec64d5..a83b3df 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -31,16 +31,40 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
+using System;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using System.Xml;
+using log4net;
+using Mono.Addins;
+using OpenMetaverse.Messages.Linden;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
 namespace OpenSim.Region.CoreModules.Avatar.Gods
 {
     public class GodsModule : IRegionModule, IGodsModule
     {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>Special UUID for actions that apply to all agents</summary>
         private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb");
 
         protected Scene m_scene;
         protected IDialogModule m_dialogModule;
+
+        protected Dictionary<UUID, string> m_capsDict =
+                new Dictionary<UUID, string>();
         
         public void Initialise(Scene scene, IConfigSource source)
         {
@@ -48,6 +72,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
             m_scene.RegisterModuleInterface<IGodsModule>(this);
             m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
+            m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+            m_scene.EventManager.OnClientClosed += OnClientClosed;
+            scene.EventManager.OnIncomingInstantMessage +=
+                    OnIncomingInstantMessage;
         }
         
         public void PostInitialise() {}
@@ -67,6 +95,54 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             client.OnRequestGodlikePowers -= RequestGodlikePowers;
         }
         
+        private void OnClientClosed(UUID agentID, Scene scene)
+        {
+            m_capsDict.Remove(agentID);
+        }
+
+        private void OnRegisterCaps(UUID agentID, Caps caps)
+        {
+            string uri = "/CAPS/" + UUID.Random();
+            m_capsDict[agentID] = uri;
+
+            caps.RegisterHandler("UntrustedSimulatorMessage",
+                    new RestStreamHandler("POST", uri,
+                    HandleUntrustedSimulatorMessage));
+        }
+
+        private string HandleUntrustedSimulatorMessage(string request,
+                string path, string param, OSHttpRequest httpRequest,
+                OSHttpResponse httpResponse)
+        {
+            OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+
+            string message = osd["message"].AsString();
+
+            if (message == "GodKickUser")
+            {
+                OSDMap body = (OSDMap)osd["body"];
+                OSDArray userInfo = (OSDArray)body["UserInfo"];
+                OSDMap userData = (OSDMap)userInfo[0];
+
+                UUID agentID = userData["AgentID"].AsUUID();
+                UUID godID = userData["GodID"].AsUUID();
+                UUID godSessionID = userData["GodSessionID"].AsUUID();
+                uint kickFlags = userData["KickFlags"].AsUInteger();
+                string reason = userData["Reason"].AsString();
+
+                ScenePresence god = m_scene.GetScenePresence(godID);
+                if (god == null || god.ControllingClient.SessionId != godSessionID)
+                    return String.Empty;
+
+                KickUser(godID, godSessionID, agentID, kickFlags, Util.StringToBytes1024(reason));
+            }
+            else
+            {
+                m_log.ErrorFormat("[GOD]: Unhandled UntrustedSimulatorMessage: {0}", message);
+            }
+            return String.Empty;
+        }
+
         public void RequestGodlikePowers(
             UUID agentID, UUID sessionID, UUID token, bool godLike, IClientAPI controllingClient)
         {
@@ -115,71 +191,85 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
         /// <param name="reason">The message to send to the user after it's been turned into a field</param>
         public void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason)
         {
-            UUID kickUserID = ALL_AGENTS;
-            
+            if (!m_scene.Permissions.IsGod(godID))
+                return;
+
             ScenePresence sp = m_scene.GetScenePresence(agentID);
 
-            if (sp != null || agentID == kickUserID)
+            if (sp == null && agentID != ALL_AGENTS)
             {
-                if (m_scene.Permissions.IsGod(godID))
+                IMessageTransferModule transferModule =
+                        m_scene.RequestModuleInterface<IMessageTransferModule>();
+                if (transferModule != null)
                 {
-                    if (kickflags == 0)
-                    {
-                        if (agentID == kickUserID)
-                        {
-                            string reasonStr = Utils.BytesToString(reason);
-
-                            m_scene.ForEachClient(
-                                delegate(IClientAPI controller)
-                                {
-                                    if (controller.AgentId != godID)
-                                        controller.Kick(reasonStr);
-                                }
-                            );
-
-                            // This is a bit crude. It seems the client will be null before it actually stops the thread
-                            // The thread will kill itself eventually :/
-                            // Is there another way to make sure *all* clients get this 'inter region' message?
-                            m_scene.ForEachScenePresence(
-                                delegate(ScenePresence p)
-                                {
-                                    if (p.UUID != godID && !p.IsChildAgent)
-                                    {
-                                        // Possibly this should really be p.Close() though that method doesn't send a close
-                                        // to the client
-                                        p.ControllingClient.Close();
-                                    }
-                                }
-                            );
-                        }
-                        else
-                        {
-                            m_scene.SceneGraph.removeUserCount(!sp.IsChildAgent);
+                    m_log.DebugFormat("[GODS]: Sending nonlocal kill for agent {0}", agentID);
+                    transferModule.SendInstantMessage(new GridInstantMessage(
+                            m_scene, godID, "God", agentID, (byte)250, false,
+                            Utils.BytesToString(reason), UUID.Zero, true,
+                            new Vector3(), new byte[] {(byte)kickflags}),
+                            delegate(bool success) {} );
+                }
+                return;
+            }
 
-                            sp.ControllingClient.Kick(Utils.BytesToString(reason));
-                            sp.ControllingClient.Close();
-                        }
-                    }
-                    
-                    if (kickflags == 1)
-                    {
-                        sp.AllowMovement = false;
-                        m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
-                        m_dialogModule.SendAlertToUser(godID, "User Frozen");
-                    }
-                    
-                    if (kickflags == 2)
-                    {
-                        sp.AllowMovement = true;
-                        m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
-                        m_dialogModule.SendAlertToUser(godID, "User Unfrozen");
-                    }
+            switch (kickflags)
+            {
+            case 0:
+                if (sp != null)
+                {
+                    KickPresence(sp, Utils.BytesToString(reason));
                 }
-                else
+                else if (agentID == ALL_AGENTS)
                 {
-                    m_dialogModule.SendAlertToUser(godID, "Kick request denied");
+                    m_scene.ForEachScenePresence(
+                            delegate(ScenePresence p)
+                            {
+                                if (p.UUID != godID && (!m_scene.Permissions.IsGod(p.UUID)))
+                                    KickPresence(p, Utils.BytesToString(reason));
+                            }
+                    );
                 }
+                break;
+            case 1:
+                if (sp != null)
+                {
+                    sp.AllowMovement = false;
+                    m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+                    m_dialogModule.SendAlertToUser(godID, "User Frozen");
+                }
+                break;
+            case 2:
+                if (sp != null)
+                {
+                    sp.AllowMovement = true;
+                    m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+                    m_dialogModule.SendAlertToUser(godID, "User Unfrozen");
+                }
+                break;
+            default:
+                break;
+            }
+        }
+
+        private void KickPresence(ScenePresence sp, string reason)
+        {
+            if (sp.IsChildAgent)
+                return;
+            sp.ControllingClient.Kick(reason);
+            sp.Scene.IncomingCloseAgent(sp.UUID);
+        }
+
+        private void OnIncomingInstantMessage(GridInstantMessage msg)
+        {
+            if (msg.dialog == (uint)250) // Nonlocal kick
+            {
+                UUID agentID = new UUID(msg.toAgentID);
+                string reason = msg.message;
+                UUID godID = new UUID(msg.fromAgentID);
+                uint kickMode = (uint)msg.binaryBucket[0];
+
+                KickUser(godID, UUID.Zero, agentID, kickMode, Util.StringToBytes1024(reason));
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
index c011776..008233b 100644
--- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
         {
             UUID capuuid = UUID.Random();
             
-            m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/");
+//            m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/");
 
             caps.RegisterHandler("ObjectAdd",
                                  new RestHTTPHandler("POST", "/CAPS/OA/" + capuuid + "/",
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index f9d28b9..e0f36a2 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -641,7 +641,17 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             lock (m_openRequests)
                 m_openRequests.Add(requestID, mrs);
 
-            WebRequest mapitemsrequest = WebRequest.Create(httpserver);
+            WebRequest mapitemsrequest = null;
+            try
+            {
+                mapitemsrequest = WebRequest.Create(httpserver);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[WORLD MAP]: Access to {0} failed with {1}", httpserver, e);
+                return new OSDMap();
+            }
+
             mapitemsrequest.Method = "POST";
             mapitemsrequest.ContentType = "application/xml+llsd";
             OSDMap RAMap = new OSDMap();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index e1fedf4..48beb9c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Region.Framework.Scenes
     public delegate bool DuplicateObjectHandler(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition);
     public delegate bool EditObjectHandler(UUID objectID, UUID editorID, Scene scene);
     public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene);
+    public delegate bool ViewObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene);
     public delegate bool MoveObjectHandler(UUID objectID, UUID moverID, Scene scene);
     public delegate bool ObjectEntryHandler(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene);
     public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene);
@@ -116,6 +117,7 @@ namespace OpenSim.Region.Framework.Scenes
         public event DuplicateObjectHandler OnDuplicateObject;
         public event EditObjectHandler OnEditObject;
         public event EditObjectInventoryHandler OnEditObjectInventory;
+        public event ViewObjectInventoryHandler OnViewObjectInventory;
         public event MoveObjectHandler OnMoveObject;
         public event ObjectEntryHandler OnObjectEntry;
         public event ReturnObjectsHandler OnReturnObjects;
@@ -401,6 +403,21 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
+        public bool CanViewObjectInventory(UUID objectID, UUID editorID)
+        {
+            ViewObjectInventoryHandler handler = OnViewObjectInventory;
+            if (handler != null)
+            {
+                Delegate[] list = handler.GetInvocationList();
+                foreach (ViewObjectInventoryHandler h in list)
+                {
+                    if (h(objectID, editorID, m_scene) == false)
+                        return false;
+                }
+            }
+            return true;
+        }
+
         #endregion
 
         #region MOVE OBJECT
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 066e504..a4f630a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Region.Framework.Scenes
         private int m_update_events = 1;
         private int m_update_backup = 200;
         private int m_update_terrain = 50;
-//        private int m_update_land = 1;
+        private int m_update_land = 10;
         private int m_update_coarse_locations = 50;
 
         private int frameMS;
@@ -1330,12 +1330,12 @@ namespace OpenSim.Region.Framework.Scenes
                             terrainMS = Util.EnvironmentTickCountSubtract(terMS);
                         }
 
-                        //if (m_frame % m_update_land == 0)
-                        //{
-                        //    int ldMS = Util.EnvironmentTickCount();
-                        //    UpdateLand();
-                        //    landMS = Util.EnvironmentTickCountSubtract(ldMS);
-                        //}
+                        if (m_frame % m_update_land == 0)
+                        {
+                            int ldMS = Util.EnvironmentTickCount();
+                            UpdateLand();
+                            landMS = Util.EnvironmentTickCountSubtract(ldMS);
+                        }
 
                         frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS);
                         otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 8761284..2ee8c07 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -881,7 +881,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 item.ParentID = m_part.UUID;
                 item.ParentPartID = m_part.UUID;
-                item.Flags = m_items[item.ItemID].Flags;
 
                 // If group permissions have been set on, check that the groupID is up to date in case it has
                 // changed since permissions were last set.
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 927f78d..6a3983f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1054,10 +1054,6 @@ namespace OpenSim.Region.Framework.Scenes
             //else
             //    m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid);
             
-            // On the next prim update, all objects will be sent
-            //
-            m_sceneViewer.Reset();
-
             m_isChildAgent = false;
 
             // send the animations of the other presences to me
@@ -1241,7 +1237,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void CompleteMovement(IClientAPI client)
         {
-            DateTime startTime = DateTime.Now;
+//            DateTime startTime = DateTime.Now;
             
             m_log.DebugFormat(
                 "[SCENE PRESENCE]: Completing movement of {0} into region {1}", 
@@ -1294,9 +1290,9 @@ namespace OpenSim.Region.Framework.Scenes
                     friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
             }
 
-            m_log.DebugFormat(
-                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
-                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
+//            m_log.DebugFormat(
+//                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
+//                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
         }
 
         /// <summary>
@@ -3311,10 +3307,6 @@ namespace OpenSim.Region.Framework.Scenes
             if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0)
                 ControllingClient.SetChildAgentThrottle(cAgentData.Throttles);
 
-            // Sends out the objects in the user's draw distance if m_sendTasksToChild is true.
-            if (m_scene.m_seeIntoRegionFromNeighbor)
-                m_sceneViewer.Reset();
-
             //cAgentData.AVHeight;
             m_rootRegionHandle = cAgentData.RegionHandle;
             //m_velocity = cAgentData.Velocity;