Merge branch 'master' into careminster-presence-refactor

Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.

2 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index de6e815..2e5020b 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -163,7 +163,7 @@ namespace OpenSim.Data.Null
             // We can't simply store groups here because on delinking, OpenSim will not update the original group
             // directly.  Rather, the newly delinked parts will be updated to be in their own scene object group
             // Therefore, we need to store parts rather than groups.
-            foreach (SceneObjectPart prim in obj.Children.Values)
+            foreach (SceneObjectPart prim in obj.Parts)
             {
                 m_log.DebugFormat(
                     "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}", 
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index b47ad5d..fc44358 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Tests.Common.Mock
 
         public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
         {
-            InventoryFolderBase folder = m_folders[folderID];
+//            InventoryFolderBase folder = m_folders[folderID];
             
 //            m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0} {1}", folder.Name, folder.ID);
             
@@ -116,7 +116,7 @@ namespace OpenSim.Tests.Common.Mock
 
         public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
         {
-            InventoryFolderBase parentFolder = m_folders[parentID];
+//            InventoryFolderBase parentFolder = m_folders[parentID];
             
 //            m_log.DebugFormat("[MOCK INV DB]: Getting folders in folder {0} {1}", parentFolder.Name, parentFolder.ID);
             
@@ -185,7 +185,7 @@ namespace OpenSim.Tests.Common.Mock
 
         public void addInventoryItem(InventoryItemBase item) 
         {
-            InventoryFolderBase folder = m_folders[item.Folder];
+//            InventoryFolderBase folder = m_folders[item.Folder];
             
 //            m_log.DebugFormat(
 //                "[MOCK INV DB]: Adding inventory item {0} {1} in {2} {3}", item.Name, item.ID, folder.Name, folder.ID);