Several more buglets removed.

5 files changed, 20 insertions, 21 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index c01d66a..a0ff151 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -196,10 +196,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
         public void UpdateDatabase(UUID user, AvatarAppearance appearance)
         {
-            m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
+            //m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
             AvatarData adata = new AvatarData(appearance);
             m_scene.AvatarService.SetAvatar(user, adata);
-
         }
 
         private static byte[] GetDefaultVisualParams()
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index bd2d8cb..227c37f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 return false;
 
             // Try local first
-            if (m_localBackend.CreateObject(destination, sog, true))
+            if (m_localBackend.CreateObject(destination, sog, isLocalCall))
             {
                 //m_log.Debug("[REST COMMS]: LocalBackEnd SendCreateObject succeeded");
                 return true;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 70aea75..62a831e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2358,7 +2358,7 @@ namespace OpenSim.Region.Framework.Scenes
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                 item = InventoryService.GetItem(item);
 
-                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID);
+                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
             }
             return att.UUID;
         }
@@ -2403,7 +2403,7 @@ namespace OpenSim.Region.Framework.Scenes
                 // XXYY!!
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                 item = InventoryService.GetItem(item);
-                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID);
+                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */);
 
                 if (m_AvatarFactory != null)
                 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4bbea16..206e2f8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2553,6 +2553,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                 return false;
             }
+
+            sceneObject.SetScene(this);
+
             // Force allocation of new LocalId
             //
             foreach (SceneObjectPart p in sceneObject.Children.Values)
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 1e7f54a..63719ac 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -414,7 +414,7 @@ namespace OpenSim.Region.Framework.Scenes
             /// Create the necessary child agents
             List<AgentCircuitData> cagents = new List<AgentCircuitData>();
             foreach (GridRegion neighbour in neighbours)
-                {
+            {
                 if (neighbour.RegionHandle != avatar.Scene.RegionInfo.RegionHandle)
                 {
 
@@ -446,7 +446,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (avatar.Scene.CapsModule != null)
             {
-                // These two are the same thing!
                 avatar.Scene.CapsModule.SetChildrenSeed(avatar.UUID, seeds);
             }
             avatar.KnownRegions = seeds;
@@ -516,8 +515,6 @@ namespace OpenSim.Region.Framework.Scenes
             agent.InventoryFolder = UUID.Zero;
             agent.startpos = new Vector3(128, 128, 70);
             agent.child = true;
-            if (avatar.Appearance == null)
-                m_log.Debug("XXX Appearance is null!!!!");
             agent.Appearance = avatar.Appearance;
 
             InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
@@ -1450,17 +1447,17 @@ namespace OpenSim.Region.Framework.Scenes
             return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
         }
 
-        //private void Dump(string msg, List<ulong> handles)
-        //{
-        //    m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
-        //    foreach (ulong handle in handles)
-        //    {
-        //        uint x, y;
-        //        Utils.LongToUInts(handle, out x, out y);
-        //        x = x / Constants.RegionSize;
-        //        y = y / Constants.RegionSize;
-        //        m_log.InfoFormat("({0}, {1})", x, y);
-        //    }
-        //}
+        private void Dump(string msg, List<ulong> handles)
+        {
+            m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
+            foreach (ulong handle in handles)
+            {
+                uint x, y;
+                Utils.LongToUInts(handle, out x, out y);
+                x = x / Constants.RegionSize;
+                y = y / Constants.RegionSize;
+                m_log.InfoFormat("({0}, {1})", x, y);
+            }
+        }
     }
 }