diff options
author | Justin Clark-Casey (justincc) | 2010-08-27 23:22:49 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-27 23:22:49 +0100 |
commit | 86937d0a0f5572b002cdb6efc499c234b2a9bd1b (patch) | |
tree | 6791667725972cfbc4a7965326f83502c53b87bf /OpenSim/Tests | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-86937d0a0f5572b002cdb6efc499c234b2a9bd1b.zip opensim-SC_OLD-86937d0a0f5572b002cdb6efc499c234b2a9bd1b.tar.gz opensim-SC_OLD-86937d0a0f5572b002cdb6efc499c234b2a9bd1b.tar.bz2 opensim-SC_OLD-86937d0a0f5572b002cdb6efc499c234b2a9bd1b.tar.xz |
allow inventory path specified in "load iar" to start with a / (e.g. /Objects is now valid where it wasn't before)
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs index ed0b1a6..b70b47d 100644 --- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Tests.Common.Mock | |||
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 | ||
91 | List<InventoryItemBase> items = new List<InventoryItemBase>(); | 91 | List<InventoryItemBase> items = new List<InventoryItemBase>(); |
92 | 92 | ||
@@ -94,7 +94,7 @@ namespace OpenSim.Tests.Common.Mock | |||
94 | { | 94 | { |
95 | if (item.Folder == folderID) | 95 | if (item.Folder == folderID) |
96 | { | 96 | { |
97 | m_log.DebugFormat("[MOCK INV DB]: getInventoryInFolder() adding item {0}", item.Name); | 97 | // m_log.DebugFormat("[MOCK INV DB]: getInventoryInFolder() adding item {0}", item.Name); |
98 | items.Add(item); | 98 | items.Add(item); |
99 | } | 99 | } |
100 | } | 100 | } |
@@ -106,7 +106,7 @@ namespace OpenSim.Tests.Common.Mock | |||
106 | 106 | ||
107 | public InventoryFolderBase getUserRootFolder(UUID user) | 107 | public InventoryFolderBase getUserRootFolder(UUID user) |
108 | { | 108 | { |
109 | m_log.DebugFormat("[MOCK INV DB]: Looking for root folder for {0}", user); | 109 | // m_log.DebugFormat("[MOCK INV DB]: Looking for root folder for {0}", user); |
110 | 110 | ||
111 | InventoryFolderBase folder = null; | 111 | InventoryFolderBase folder = null; |
112 | m_rootFolders.TryGetValue(user, out folder); | 112 | m_rootFolders.TryGetValue(user, out folder); |
@@ -118,7 +118,7 @@ namespace OpenSim.Tests.Common.Mock | |||
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 | ||
123 | List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); | 123 | List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); |
124 | 124 | ||
@@ -126,9 +126,9 @@ namespace OpenSim.Tests.Common.Mock | |||
126 | { | 126 | { |
127 | if (folder.ParentID == parentID) | 127 | if (folder.ParentID == parentID) |
128 | { | 128 | { |
129 | m_log.DebugFormat( | 129 | // m_log.DebugFormat( |
130 | "[MOCK INV DB]: Found folder {0} {1} in {2} {3}", | 130 | // "[MOCK INV DB]: Found folder {0} {1} in {2} {3}", |
131 | folder.Name, folder.ID, parentFolder.Name, parentFolder.ID); | 131 | // folder.Name, folder.ID, parentFolder.Name, parentFolder.ID); |
132 | 132 | ||
133 | folders.Add(folder); | 133 | folders.Add(folder); |
134 | } | 134 | } |
@@ -152,9 +152,9 @@ namespace OpenSim.Tests.Common.Mock | |||
152 | 152 | ||
153 | public void addInventoryFolder(InventoryFolderBase folder) | 153 | public void addInventoryFolder(InventoryFolderBase folder) |
154 | { | 154 | { |
155 | m_log.DebugFormat( | 155 | // m_log.DebugFormat( |
156 | "[MOCK INV DB]: Adding inventory folder {0} {1} type {2}", | 156 | // "[MOCK INV DB]: Adding inventory folder {0} {1} type {2}", |
157 | folder.Name, folder.ID, (AssetType)folder.Type); | 157 | // folder.Name, folder.ID, (AssetType)folder.Type); |
158 | 158 | ||
159 | m_folders[folder.ID] = folder; | 159 | m_folders[folder.ID] = folder; |
160 | 160 | ||
@@ -187,8 +187,8 @@ namespace OpenSim.Tests.Common.Mock | |||
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); |
192 | 192 | ||
193 | m_items[item.ID] = item; | 193 | m_items[item.ID] = item; |
194 | } | 194 | } |