Merge branch 'master' of ssh://MyConnection/var/git/opensim

3 files changed, 11 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a119efc..a9d361b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -179,8 +179,8 @@ namespace OpenSim.Region.Framework.Scenes
             else
             {
                 m_log.ErrorFormat(
-                    "[AGENT INVENTORY]: Could not resolve user {0} for caps inventory update",
-                    remoteClient.AgentId);
+                    "[AGENT INVENTORY]: Could not find item {0} for caps inventory update",
+                    itemID);
             }
 
             return UUID.Zero;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 77b980c..d722e23 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -519,7 +519,7 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat(
 //                "[AGENT INVENTORY]: Updating inventory folder {0} {1} for {2} {3}", folderID, name, remoteClient.Name, remoteClient.AgentId);
 
-            InventoryFolderBase folder = new InventoryFolderBase(folderID);
+            InventoryFolderBase folder = new InventoryFolderBase(folderID, remoteClient.AgentId);
             folder = InventoryService.GetFolder(folder);
             if (folder != null)
             {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index ce6f3d6..3ee6007 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -225,7 +225,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(presence.AbsolutePosition, Is.EqualTo(pos), "Position is not the same one entered");
         }
 
-        [Test]
+        // I'm commenting this test because it does not represent
+        // crossings. The Thread.Sleep's in here are not meaningful mocks,
+        // and they sometimes fail in panda.
+        // We need to talk in order to develop a test
+        // that really tests region crossings. There are 3 async components,
+        // but things are synchronous among them. So there should be
+        // 3 threads in here.
+        //[Test]
         public void T021_TestCrossToNewRegion()
         {
             TestHelper.InMethod();