aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut
diff options
context:
space:
mode:
authorDiva Canto2009-08-13 14:10:12 -0700
committerDiva Canto2009-08-13 14:10:12 -0700
commit5246dc33dcfc51b7ebb19b269159df3991029350 (patch)
treeaf1a8fa9e0f6408b3280e0165080ac0d580597d9 /OpenSim/Region/CoreModules/ServiceConnectorsOut
parentInventory redirects from CachedUserInfo to InventoryService COMPLETE! (diff)
downloadopensim-SC_OLD-5246dc33dcfc51b7ebb19b269159df3991029350.zip
opensim-SC_OLD-5246dc33dcfc51b7ebb19b269159df3991029350.tar.gz
opensim-SC_OLD-5246dc33dcfc51b7ebb19b269159df3991029350.tar.bz2
opensim-SC_OLD-5246dc33dcfc51b7ebb19b269159df3991029350.tar.xz
Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs4
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs8
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs8
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs4
4 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
index 375faf5..0526bc4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
@@ -184,9 +184,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
184 /// <returns>true if the item was successfully deleted</returns> 184 /// <returns>true if the item was successfully deleted</returns>
185 public abstract bool DeleteItem(InventoryItemBase item); 185 public abstract bool DeleteItem(InventoryItemBase item);
186 186
187 public abstract InventoryItemBase QueryItem(InventoryItemBase item); 187 public abstract InventoryItemBase GetItem(InventoryItemBase item);
188 188
189 public abstract InventoryFolderBase QueryFolder(InventoryFolderBase folder); 189 public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder);
190 190
191 /// <summary> 191 /// <summary>
192 /// Does the given user have an inventory structure? 192 /// Does the given user have an inventory structure?
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 62b9bed..db4e7f4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -387,13 +387,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
387 } 387 }
388 } 388 }
389 389
390 public override InventoryItemBase QueryItem(InventoryItemBase item) 390 public override InventoryItemBase GetItem(InventoryItemBase item)
391 { 391 {
392 if (item == null) 392 if (item == null)
393 return null; 393 return null;
394 394
395 if (IsLocalGridUser(item.Owner)) 395 if (IsLocalGridUser(item.Owner))
396 return m_GridService.QueryItem(item); 396 return m_GridService.GetItem(item);
397 else 397 else
398 { 398 {
399 UUID sessionID = GetSessionID(item.Owner); 399 UUID sessionID = GetSessionID(item.Owner);
@@ -402,13 +402,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
402 } 402 }
403 } 403 }
404 404
405 public override InventoryFolderBase QueryFolder(InventoryFolderBase folder) 405 public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
406 { 406 {
407 if (folder == null) 407 if (folder == null)
408 return null; 408 return null;
409 409
410 if (IsLocalGridUser(folder.Owner)) 410 if (IsLocalGridUser(folder.Owner))
411 return m_GridService.QueryFolder(folder); 411 return m_GridService.GetFolder(folder);
412 else 412 else
413 { 413 {
414 UUID sessionID = GetSessionID(folder.Owner); 414 UUID sessionID = GetSessionID(folder.Owner);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 6efe903..ccf06d1 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -292,14 +292,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
292 return m_InventoryService.DeleteItem(item); 292 return m_InventoryService.DeleteItem(item);
293 } 293 }
294 294
295 public override InventoryItemBase QueryItem(InventoryItemBase item) 295 public override InventoryItemBase GetItem(InventoryItemBase item)
296 { 296 {
297 return m_InventoryService.QueryItem(item); 297 return m_InventoryService.GetItem(item);
298 } 298 }
299 299
300 public override InventoryFolderBase QueryFolder(InventoryFolderBase folder) 300 public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
301 { 301 {
302 return m_InventoryService.QueryFolder(folder); 302 return m_InventoryService.GetFolder(folder);
303 } 303 }
304 304
305 /// <summary> 305 /// <summary>
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index f87aab9..4f19573 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -273,7 +273,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
273 return m_RemoteConnector.DeleteItem(item.Owner.ToString(), item, sessionID); 273 return m_RemoteConnector.DeleteItem(item.Owner.ToString(), item, sessionID);
274 } 274 }
275 275
276 public override InventoryItemBase QueryItem(InventoryItemBase item) 276 public override InventoryItemBase GetItem(InventoryItemBase item)
277 { 277 {
278 if (item == null) 278 if (item == null)
279 return null; 279 return null;
@@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
282 return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID); 282 return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID);
283 } 283 }
284 284
285 public override InventoryFolderBase QueryFolder(InventoryFolderBase folder) 285 public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
286 { 286 {
287 if (folder == null) 287 if (folder == null)
288 return null; 288 return null;