aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorDiva Canto2009-08-10 12:44:15 -0700
committerDiva Canto2009-08-10 12:44:15 -0700
commit17cc9b98573a1c4dd4a69113eea90c7fbeccad83 (patch)
treeacfdf6b3d25e8b30797ea77a1c8f10842152fbce /OpenSim/Grid
parentConditional to prevent a null ref in tests. The tests may still not pass. (diff)
downloadopensim-SC_OLD-17cc9b98573a1c4dd4a69113eea90c7fbeccad83.zip
opensim-SC_OLD-17cc9b98573a1c4dd4a69113eea90c7fbeccad83.tar.gz
opensim-SC_OLD-17cc9b98573a1c4dd4a69113eea90c7fbeccad83.tar.bz2
opensim-SC_OLD-17cc9b98573a1c4dd4a69113eea90c7fbeccad83.tar.xz
Last piece of cleaning up old inventory. Old IInventoryServices and ISecureInventoryService interfaces removed.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryService.cs2
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs4
2 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryService.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryService.cs
index d9de29f..0effa9f 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryService.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryService.cs
@@ -34,8 +34,6 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
34{ 34{
35 public class OpenSimInventoryService : InventoryServiceBase 35 public class OpenSimInventoryService : InventoryServiceBase
36 { 36 {
37 public override void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback) {}
38
39 public InventoryFolderWithChildren GetInventoryFolder(UUID folderID) 37 public InventoryFolderWithChildren GetInventoryFolder(UUID folderID)
40 { 38 {
41 InventoryFolderBase baseFolder = null; 39 InventoryFolderBase baseFolder = null;
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 3c94bf3..0704faa 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -145,10 +145,6 @@ namespace OpenSim.Grid.InventoryServer
145 } 145 }
146 } 146 }
147 147
148 public override void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback)
149 {
150 }
151
152 /// <summary> 148 /// <summary>
153 /// Return a user's entire inventory 149 /// Return a user's entire inventory
154 /// </summary> 150 /// </summary>