diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index dceda38..f87aab9 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | |||
@@ -40,7 +40,7 @@ using OpenMetaverse; | |||
40 | 40 | ||
41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | 41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory |
42 | { | 42 | { |
43 | public class RemoteInventoryServicesConnector : InventoryCache, ISharedRegionModule, IInventoryService | 43 | public class RemoteInventoryServicesConnector : BaseInventoryConnector, ISharedRegionModule, IInventoryService |
44 | { | 44 | { |
45 | private static readonly ILog m_log = | 45 | private static readonly ILog m_log = |
46 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
102 | { | 102 | { |
103 | } | 103 | } |
104 | 104 | ||
105 | public override void AddRegion(Scene scene) | 105 | public void AddRegion(Scene scene) |
106 | { | 106 | { |
107 | if (!m_Enabled) | 107 | if (!m_Enabled) |
108 | return; | 108 | return; |
@@ -117,12 +117,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
117 | } | 117 | } |
118 | 118 | ||
119 | scene.RegisterModuleInterface<IInventoryService>(this); | 119 | scene.RegisterModuleInterface<IInventoryService>(this); |
120 | base.AddRegion(scene); | 120 | m_cache.AddRegion(scene); |
121 | } | 121 | } |
122 | 122 | ||
123 | public override void RemoveRegion(Scene scene) | 123 | public void RemoveRegion(Scene scene) |
124 | { | 124 | { |
125 | base.RemoveRegion(scene); | 125 | if (!m_Enabled) |
126 | return; | ||
127 | |||
128 | m_cache.RemoveRegion(scene); | ||
126 | } | 129 | } |
127 | 130 | ||
128 | public void RegionLoaded(Scene scene) | 131 | public void RegionLoaded(Scene scene) |
@@ -138,22 +141,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
138 | 141 | ||
139 | #region IInventoryService | 142 | #region IInventoryService |
140 | 143 | ||
141 | public bool CreateUserInventory(UUID user) | 144 | public override bool CreateUserInventory(UUID user) |
142 | { | 145 | { |
143 | return false; | 146 | return false; |
144 | } | 147 | } |
145 | 148 | ||
146 | public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) | 149 | public override List<InventoryFolderBase> GetInventorySkeleton(UUID userId) |
147 | { | 150 | { |
148 | return new List<InventoryFolderBase>(); | 151 | return new List<InventoryFolderBase>(); |
149 | } | 152 | } |
150 | 153 | ||
151 | public InventoryCollection GetUserInventory(UUID userID) | 154 | public override InventoryCollection GetUserInventory(UUID userID) |
152 | { | 155 | { |
153 | return null; | 156 | return null; |
154 | } | 157 | } |
155 | 158 | ||
156 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) | 159 | public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback) |
157 | { | 160 | { |
158 | UUID sessionID = GetSessionID(userID); | 161 | UUID sessionID = GetSessionID(userID); |
159 | try | 162 | try |
@@ -180,7 +183,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
180 | return m_RemoteConnector.GetSystemFolders(userID.ToString(), sessionID); | 183 | return m_RemoteConnector.GetSystemFolders(userID.ToString(), sessionID); |
181 | } | 184 | } |
182 | 185 | ||
183 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) | 186 | public override InventoryCollection GetFolderContent(UUID userID, UUID folderID) |
184 | { | 187 | { |
185 | UUID sessionID = GetSessionID(userID); | 188 | UUID sessionID = GetSessionID(userID); |
186 | try | 189 | try |
@@ -199,12 +202,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
199 | return nullCollection; | 202 | return nullCollection; |
200 | } | 203 | } |
201 | 204 | ||
202 | public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) | 205 | public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) |
203 | { | 206 | { |
204 | return new List<InventoryItemBase>(); | 207 | return new List<InventoryItemBase>(); |
205 | } | 208 | } |
206 | 209 | ||
207 | public bool AddFolder(InventoryFolderBase folder) | 210 | public override bool AddFolder(InventoryFolderBase folder) |
208 | { | 211 | { |
209 | if (folder == null) | 212 | if (folder == null) |
210 | return false; | 213 | return false; |
@@ -213,7 +216,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
213 | return m_RemoteConnector.AddFolder(folder.Owner.ToString(), folder, sessionID); | 216 | return m_RemoteConnector.AddFolder(folder.Owner.ToString(), folder, sessionID); |
214 | } | 217 | } |
215 | 218 | ||
216 | public bool UpdateFolder(InventoryFolderBase folder) | 219 | public override bool UpdateFolder(InventoryFolderBase folder) |
217 | { | 220 | { |
218 | if (folder == null) | 221 | if (folder == null) |
219 | return false; | 222 | return false; |
@@ -222,7 +225,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
222 | return m_RemoteConnector.UpdateFolder(folder.Owner.ToString(), folder, sessionID); | 225 | return m_RemoteConnector.UpdateFolder(folder.Owner.ToString(), folder, sessionID); |
223 | } | 226 | } |
224 | 227 | ||
225 | public bool MoveFolder(InventoryFolderBase folder) | 228 | public override bool MoveFolder(InventoryFolderBase folder) |
226 | { | 229 | { |
227 | if (folder == null) | 230 | if (folder == null) |
228 | return false; | 231 | return false; |
@@ -231,7 +234,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
231 | return m_RemoteConnector.MoveFolder(folder.Owner.ToString(), folder, sessionID); | 234 | return m_RemoteConnector.MoveFolder(folder.Owner.ToString(), folder, sessionID); |
232 | } | 235 | } |
233 | 236 | ||
234 | public bool PurgeFolder(InventoryFolderBase folder) | 237 | public override bool PurgeFolder(InventoryFolderBase folder) |
235 | { | 238 | { |
236 | if (folder == null) | 239 | if (folder == null) |
237 | return false; | 240 | return false; |
@@ -240,7 +243,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
240 | return m_RemoteConnector.PurgeFolder(folder.Owner.ToString(), folder, sessionID); | 243 | return m_RemoteConnector.PurgeFolder(folder.Owner.ToString(), folder, sessionID); |
241 | } | 244 | } |
242 | 245 | ||
243 | public bool AddItem(InventoryItemBase item) | 246 | // public bool AddItem(InventoryItemBase item) inherited |
247 | // Uses AddItemPlain | ||
248 | |||
249 | protected override bool AddItemPlain(InventoryItemBase item) | ||
244 | { | 250 | { |
245 | if (item == null) | 251 | if (item == null) |
246 | return false; | 252 | return false; |
@@ -249,7 +255,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
249 | return m_RemoteConnector.AddItem(item.Owner.ToString(), item, sessionID); | 255 | return m_RemoteConnector.AddItem(item.Owner.ToString(), item, sessionID); |
250 | } | 256 | } |
251 | 257 | ||
252 | public bool UpdateItem(InventoryItemBase item) | 258 | public override bool UpdateItem(InventoryItemBase item) |
253 | { | 259 | { |
254 | if (item == null) | 260 | if (item == null) |
255 | return false; | 261 | return false; |
@@ -258,7 +264,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
258 | return m_RemoteConnector.UpdateItem(item.Owner.ToString(), item, sessionID); | 264 | return m_RemoteConnector.UpdateItem(item.Owner.ToString(), item, sessionID); |
259 | } | 265 | } |
260 | 266 | ||
261 | public bool DeleteItem(InventoryItemBase item) | 267 | public override bool DeleteItem(InventoryItemBase item) |
262 | { | 268 | { |
263 | if (item == null) | 269 | if (item == null) |
264 | return false; | 270 | return false; |
@@ -267,7 +273,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
267 | return m_RemoteConnector.DeleteItem(item.Owner.ToString(), item, sessionID); | 273 | return m_RemoteConnector.DeleteItem(item.Owner.ToString(), item, sessionID); |
268 | } | 274 | } |
269 | 275 | ||
270 | public InventoryItemBase QueryItem(InventoryItemBase item) | 276 | public override InventoryItemBase QueryItem(InventoryItemBase item) |
271 | { | 277 | { |
272 | if (item == null) | 278 | if (item == null) |
273 | return null; | 279 | return null; |
@@ -276,7 +282,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
276 | return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID); | 282 | return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID); |
277 | } | 283 | } |
278 | 284 | ||
279 | public InventoryFolderBase QueryFolder(InventoryFolderBase folder) | 285 | public override InventoryFolderBase QueryFolder(InventoryFolderBase folder) |
280 | { | 286 | { |
281 | if (folder == null) | 287 | if (folder == null) |
282 | return null; | 288 | return null; |
@@ -285,17 +291,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
285 | return m_RemoteConnector.QueryFolder(folder.Owner.ToString(), folder, sessionID); | 291 | return m_RemoteConnector.QueryFolder(folder.Owner.ToString(), folder, sessionID); |
286 | } | 292 | } |
287 | 293 | ||
288 | public bool HasInventoryForUser(UUID userID) | 294 | public override bool HasInventoryForUser(UUID userID) |
289 | { | 295 | { |
290 | return false; | 296 | return false; |
291 | } | 297 | } |
292 | 298 | ||
293 | public InventoryFolderBase GetRootFolder(UUID userID) | 299 | public override InventoryFolderBase GetRootFolder(UUID userID) |
294 | { | 300 | { |
295 | return null; | 301 | return null; |
296 | } | 302 | } |
297 | 303 | ||
298 | public List<InventoryItemBase> GetActiveGestures(UUID userId) | 304 | public override List<InventoryItemBase> GetActiveGestures(UUID userId) |
299 | { | 305 | { |
300 | return new List<InventoryItemBase>(); | 306 | return new List<InventoryItemBase>(); |
301 | } | 307 | } |