diff options
author | John Hurliman | 2009-09-30 15:28:23 -0700 |
---|---|---|
committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs | |
parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs')
-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 daef38b..0c7ebca 100644 --- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Tests.Common.Mock | |||
52 | //// <value> | 52 | //// <value> |
53 | /// Inventory items | 53 | /// Inventory items |
54 | /// </value> | 54 | /// </value> |
55 | private Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>(); | 55 | private Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>(); |
56 | 56 | ||
57 | /// <value> | 57 | /// <value> |
58 | /// User root folders | 58 | /// User root folders |
@@ -120,7 +120,7 @@ namespace OpenSim.Tests.Common.Mock | |||
120 | } | 120 | } |
121 | 121 | ||
122 | return folders; | 122 | return folders; |
123 | } | 123 | } |
124 | 124 | ||
125 | public InventoryFolderBase getInventoryFolder(UUID folderId) | 125 | public InventoryFolderBase getInventoryFolder(UUID folderId) |
126 | { | 126 | { |
@@ -191,7 +191,7 @@ namespace OpenSim.Tests.Common.Mock | |||
191 | public InventoryItemBase queryInventoryItem(UUID item) | 191 | public InventoryItemBase queryInventoryItem(UUID item) |
192 | { | 192 | { |
193 | return null; | 193 | return null; |
194 | } | 194 | } |
195 | 195 | ||
196 | public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) { return null; } | 196 | public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) { return null; } |
197 | } | 197 | } |