From d52b2b9ee7c189651f9d7c04ddf3df9aa833b7ff Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 16 Sep 2010 20:46:24 +0100
Subject: minor: remove some mono compiler warnings
---
OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Tests')
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);
--
cgit v1.1
From 860b2a502f797e5822c6705d4639f370f3ac5861 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Thu, 16 Sep 2010 17:30:46 -0700
Subject: Changed SceneObjectGroup to store parts with the fast and thread-safe
MapAndArray collection
---
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Tests')
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}",
--
cgit v1.1