From 6e35ddb0e9642e6719d5043da99d45f8885d13f0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 19 Aug 2009 16:15:04 -0700
Subject: Fixes GetItem and GetFolder for SQLite. Turns out some methods were
 no-op in SQlite. Fixes most grief in
 http://opensimulator.org/mantis/view.php?id=4035
 http://opensimulator.org/mantis/view.php?id=4027

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework')

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;
-- 
cgit v1.1


From 948c7ea20b1e33ee3f3aceb87fff731ddbb3bf0e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 19 Aug 2009 18:08:20 -0700
Subject: Commented T021_TestCrossToNewRegion because (1) it can fail on panda,
 and (2) it is not a meaningful representation of region crossing.

---
 OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

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();
-- 
cgit v1.1


From 1604c9d19e12602608dbb402382cde8302185efd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 20 Aug 2009 10:14:53 -0700
Subject: One more place fixed for setting the inventory folder owner. Thanks
 jhurliman.

---
 OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

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)
             {
-- 
cgit v1.1