diff options
author | Melanie | 2010-06-18 19:50:01 +0100 |
---|---|---|
committer | Melanie | 2010-06-18 19:50:01 +0100 |
commit | 71a73d83cbb34c99fe16d819bc055e4630485015 (patch) | |
tree | 488d828b7a99eb1c48184bf22ab2f5bdf78b4bfa /OpenSim/Tests | |
parent | Remove an error in meshing error reporting. Now doesn't double-bomb (diff) | |
parent | Fix problem where iar load would duplicate huge number of folders (diff) | |
download | opensim-SC-71a73d83cbb34c99fe16d819bc055e4630485015.zip opensim-SC-71a73d83cbb34c99fe16d819bc055e4630485015.tar.gz opensim-SC-71a73d83cbb34c99fe16d819bc055e4630485015.tar.bz2 opensim-SC-71a73d83cbb34c99fe16d819bc055e4630485015.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs | 12 |
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 | } |