diff options
| author | John Hurliman | 2010-09-16 17:31:24 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-16 17:31:24 -0700 |
| commit | 5321e0e69f5813b03748155193b0833f28c532ec (patch) | |
| tree | c51d4cc760056928e97a56b09b170259b0b9e5fd /OpenSim/Tests | |
| parent | Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA... (diff) | |
| parent | Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {} (diff) | |
| download | opensim-SC_OLD-5321e0e69f5813b03748155193b0833f28c532ec.zip opensim-SC_OLD-5321e0e69f5813b03748155193b0833f28c532ec.tar.gz opensim-SC_OLD-5321e0e69f5813b03748155193b0833f28c532ec.tar.bz2 opensim-SC_OLD-5321e0e69f5813b03748155193b0833f28c532ec.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
| 84 | 84 | ||
| 85 | public List<InventoryItemBase> getInventoryInFolder(UUID folderID) | 85 | public List<InventoryItemBase> getInventoryInFolder(UUID folderID) |
| 86 | { | 86 | { |
| 87 | InventoryFolderBase folder = m_folders[folderID]; | 87 | // InventoryFolderBase folder = m_folders[folderID]; |
| 88 | 88 | ||
| 89 | // m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0} {1}", folder.Name, folder.ID); | 89 | // m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0} {1}", folder.Name, folder.ID); |
| 90 | 90 | ||
| @@ -116,7 +116,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 116 | 116 | ||
| 117 | public List<InventoryFolderBase> getInventoryFolders(UUID parentID) | 117 | public List<InventoryFolderBase> getInventoryFolders(UUID parentID) |
| 118 | { | 118 | { |
| 119 | InventoryFolderBase parentFolder = m_folders[parentID]; | 119 | // InventoryFolderBase parentFolder = m_folders[parentID]; |
| 120 | 120 | ||
| 121 | // m_log.DebugFormat("[MOCK INV DB]: Getting folders in folder {0} {1}", parentFolder.Name, parentFolder.ID); | 121 | // m_log.DebugFormat("[MOCK INV DB]: Getting folders in folder {0} {1}", parentFolder.Name, parentFolder.ID); |
| 122 | 122 | ||
| @@ -185,7 +185,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 185 | 185 | ||
| 186 | public void addInventoryItem(InventoryItemBase item) | 186 | public void addInventoryItem(InventoryItemBase item) |
| 187 | { | 187 | { |
| 188 | InventoryFolderBase folder = m_folders[item.Folder]; | 188 | // InventoryFolderBase folder = m_folders[item.Folder]; |
| 189 | 189 | ||
| 190 | // m_log.DebugFormat( | 190 | // m_log.DebugFormat( |
| 191 | // "[MOCK INV DB]: Adding inventory item {0} {1} in {2} {3}", item.Name, item.ID, folder.Name, folder.ID); | 191 | // "[MOCK INV DB]: Adding inventory item {0} {1} in {2} {3}", item.Name, item.ID, folder.Name, folder.ID); |