aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2009-03-19 21:43:35 +0000
committerdiva2009-03-19 21:43:35 +0000
commit2a76b2a417a704f4893e66347090f9f752114c1b (patch)
tree2382a5267d0c25b77dd11b3567726832ad6cc471
parent* Remove compiler warnings (diff)
downloadopensim-SC-2a76b2a417a704f4893e66347090f9f752114c1b.zip
opensim-SC-2a76b2a417a704f4893e66347090f9f752114c1b.tar.gz
opensim-SC-2a76b2a417a704f4893e66347090f9f752114c1b.tar.bz2
opensim-SC-2a76b2a417a704f4893e66347090f9f752114c1b.tar.xz
Moving GetInventoryItem up to InventoryServiceBase, since this seems like a pretty fundamental function.
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs10
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryService.cs10
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index de76415..8068080 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -321,6 +321,16 @@ namespace OpenSim.Framework.Communications
321 } 321 }
322 } 322 }
323 323
324 public InventoryItemBase GetInventoryItem(UUID itemID)
325 {
326 foreach (IInventoryDataPlugin plugin in m_plugins)
327 {
328 return plugin.getInventoryItem(itemID);
329 }
330
331 return null;
332 }
333
324 /// <summary> 334 /// <summary>
325 /// Used to create a new user inventory. 335 /// Used to create a new user inventory.
326 /// </summary> 336 /// </summary>
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryService.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryService.cs
index 3ddd07d..d9de29f 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryService.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryService.cs
@@ -54,15 +54,5 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
54 54
55 return folder; 55 return folder;
56 } 56 }
57
58 public InventoryItemBase GetInventoryItem(UUID itemID)
59 {
60 foreach (IInventoryDataPlugin plugin in m_plugins)
61 {
62 return plugin.getInventoryItem(itemID);
63 }
64
65 return null;
66 }
67 } 57 }
68} 58}