aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-18 17:37:28 +0100
committerJustin Clark-Casey (justincc)2010-06-18 17:37:28 +0100
commit71c8bbaf2c768167e377e86ae7137a86c0bb36d0 (patch)
tree356e0a08c2066e659330b6341e56a6eaa2555a27 /OpenSim/Tests/Common
parentchange TestPartExistingIarPath() to check appropriate folder creation (diff)
downloadopensim-SC_OLD-71c8bbaf2c768167e377e86ae7137a86c0bb36d0.zip
opensim-SC_OLD-71c8bbaf2c768167e377e86ae7137a86c0bb36d0.tar.gz
opensim-SC_OLD-71c8bbaf2c768167e377e86ae7137a86c0bb36d0.tar.bz2
opensim-SC_OLD-71c8bbaf2c768167e377e86ae7137a86c0bb36d0.tar.xz
Fix problem where iar load would duplicate huge number of folders
This was http://opensimulator.org/mantis/view.php?id=4770 Extend unit tests to check for this scenario too
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index 0c7ebca..fecb73f 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Tests.Common.Mock
84 84
85 public List<InventoryItemBase> getInventoryInFolder(UUID folderID) 85 public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
86 { 86 {
87 m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0}", folderID); 87// m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0}", folderID);
88 88
89 List<InventoryItemBase> items = new List<InventoryItemBase>(); 89 List<InventoryItemBase> items = new List<InventoryItemBase>();
90 90
@@ -101,7 +101,7 @@ namespace OpenSim.Tests.Common.Mock
101 101
102 public InventoryFolderBase getUserRootFolder(UUID user) 102 public InventoryFolderBase getUserRootFolder(UUID user)
103 { 103 {
104 m_log.DebugFormat("[MOCK INV DB]: Looking for root folder for {0}", user); 104// m_log.DebugFormat("[MOCK INV DB]: Looking for root folder for {0}", user);
105 105
106 InventoryFolderBase folder = null; 106 InventoryFolderBase folder = null;
107 m_rootFolders.TryGetValue(user, out folder); 107 m_rootFolders.TryGetValue(user, out folder);
@@ -141,8 +141,8 @@ namespace OpenSim.Tests.Common.Mock
141 141
142 if (folder.ParentID == UUID.Zero) 142 if (folder.ParentID == UUID.Zero)
143 { 143 {
144 m_log.DebugFormat( 144// m_log.DebugFormat(
145 "[MOCK INV DB]: Adding root folder {0} {1} for {2}", folder.Name, folder.ID, folder.Owner); 145// "[MOCK INV DB]: Adding root folder {0} {1} for {2}", folder.Name, folder.ID, folder.Owner);
146 m_rootFolders[folder.Owner] = folder; 146 m_rootFolders[folder.Owner] = folder;
147 } 147 }
148 } 148 }
@@ -166,8 +166,8 @@ namespace OpenSim.Tests.Common.Mock
166 166
167 public void addInventoryItem(InventoryItemBase item) 167 public void addInventoryItem(InventoryItemBase item)
168 { 168 {
169 m_log.DebugFormat( 169// m_log.DebugFormat(
170 "[MOCK INV DB]: Adding inventory item {0} {1} in {2}", item.Name, item.ID, item.Folder); 170// "[MOCK INV DB]: Adding inventory item {0} {1} in {2}", item.Name, item.ID, item.Folder);
171 171
172 m_items[item.ID] = item; 172 m_items[item.ID] = item;
173 } 173 }