From 5246dc33dcfc51b7ebb19b269159df3991029350 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 13 Aug 2009 14:10:12 -0700
Subject: Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query'
starting to get on my nerves.
---
.../CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 2 +-
OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs | 4 ++--
.../Avatar/Inventory/Transfer/InventoryTransferModule.cs | 8 ++++----
.../ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs | 4 ++--
.../ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 8 ++++----
.../Inventory/LocalInventoryServiceConnector.cs | 8 ++++----
.../Inventory/RemoteInventoryServiceConnector.cs | 4 ++--
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 6 +++---
8 files changed, 22 insertions(+), 22 deletions(-)
(limited to 'OpenSim/Region/CoreModules')
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 547f923..582beee 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
}
else
{
- InventoryItemBase baseItem = invService.QueryItem(new InventoryItemBase(appearance.Wearables[i].ItemID));
+ InventoryItemBase baseItem = invService.GetItem(new InventoryItemBase(appearance.Wearables[i].ItemID));
if (baseItem != null)
{
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index e61648c..a68db1b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
{
IInventoryService invService = m_scene.InventoryService;
- InventoryItemBase item = invService.QueryItem(new InventoryItemBase(gestureId));
+ InventoryItemBase item = invService.GetItem(new InventoryItemBase(gestureId));
if (item != null)
{
item.Flags = 1;
@@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
{
IInventoryService invService = m_scene.InventoryService;
- InventoryItemBase item = invService.QueryItem(new InventoryItemBase(gestureId));
+ InventoryItemBase item = invService.GetItem(new InventoryItemBase(gestureId));
if (item != null)
{
item.Flags = 0;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index b5650fd..5315c11 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
- InventoryItemBase item = invService.QueryItem(new InventoryItemBase(inventoryEntityID));
+ InventoryItemBase item = invService.GetItem(new InventoryItemBase(inventoryEntityID));
InventoryFolderBase folder = null;
if (item != null && trashFolder != null)
@@ -271,7 +271,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
}
else
{
- folder = invService.QueryFolder(new InventoryFolderBase(inventoryEntityID));
+ folder = invService.GetFolder(new InventoryFolderBase(inventoryEntityID));
if (folder != null & trashFolder != null)
{
@@ -428,7 +428,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
// Fetch from service
//
- folder = invService.QueryFolder(folder);
+ folder = invService.GetFolder(folder);
if (folder == null)
{
m_log.Debug("[INVENTORY TRANSFER] Can't find folder to give");
@@ -458,7 +458,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
// Fetch from service
//
- item = invService.QueryItem(item);
+ item = invService.GetItem(item);
if (item == null)
{
m_log.Debug("[INVENTORY TRANSFER] Can't find item to give");
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
/// true if the item was successfully deleted
public abstract bool DeleteItem(InventoryItemBase item);
- public abstract InventoryItemBase QueryItem(InventoryItemBase item);
+ public abstract InventoryItemBase GetItem(InventoryItemBase item);
- public abstract InventoryFolderBase QueryFolder(InventoryFolderBase folder);
+ public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder);
///
/// 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
}
}
- public override InventoryItemBase QueryItem(InventoryItemBase item)
+ public override InventoryItemBase GetItem(InventoryItemBase item)
{
if (item == null)
return null;
if (IsLocalGridUser(item.Owner))
- return m_GridService.QueryItem(item);
+ return m_GridService.GetItem(item);
else
{
UUID sessionID = GetSessionID(item.Owner);
@@ -402,13 +402,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
}
}
- public override InventoryFolderBase QueryFolder(InventoryFolderBase folder)
+ public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
{
if (folder == null)
return null;
if (IsLocalGridUser(folder.Owner))
- return m_GridService.QueryFolder(folder);
+ return m_GridService.GetFolder(folder);
else
{
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
return m_InventoryService.DeleteItem(item);
}
- public override InventoryItemBase QueryItem(InventoryItemBase item)
+ public override InventoryItemBase GetItem(InventoryItemBase item)
{
- return m_InventoryService.QueryItem(item);
+ return m_InventoryService.GetItem(item);
}
- public override InventoryFolderBase QueryFolder(InventoryFolderBase folder)
+ public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
{
- return m_InventoryService.QueryFolder(folder);
+ return m_InventoryService.GetFolder(folder);
}
///
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
return m_RemoteConnector.DeleteItem(item.Owner.ToString(), item, sessionID);
}
- public override InventoryItemBase QueryItem(InventoryItemBase item)
+ public override InventoryItemBase GetItem(InventoryItemBase item)
{
if (item == null)
return null;
@@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID);
}
- public override InventoryFolderBase QueryFolder(InventoryFolderBase folder)
+ public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
{
if (folder == null)
return null;
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 8f99395..9c71b41 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -966,7 +966,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (objectID == UUID.Zero) // User inventory
{
IInventoryService invService = m_scene.InventoryService;
- InventoryItemBase assetRequestItem = invService.QueryItem(new InventoryItemBase(notecard));
+ InventoryItemBase assetRequestItem = invService.GetItem(new InventoryItemBase(notecard));
if (assetRequestItem == null) // Library item
{
assetRequestItem = scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard);
@@ -1385,7 +1385,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (objectID == UUID.Zero) // User inventory
{
IInventoryService invService = m_scene.InventoryService;
- InventoryItemBase assetRequestItem = invService.QueryItem(new InventoryItemBase(script));
+ InventoryItemBase assetRequestItem = invService.GetItem(new InventoryItemBase(script));
if (assetRequestItem == null) // Library item
{
assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(script);
@@ -1479,7 +1479,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (objectID == UUID.Zero) // User inventory
{
IInventoryService invService = m_scene.InventoryService;
- InventoryItemBase assetRequestItem = invService.QueryItem(new InventoryItemBase(notecard));
+ InventoryItemBase assetRequestItem = invService.GetItem(new InventoryItemBase(notecard));
if (assetRequestItem == null) // Library item
{
assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard);
--
cgit v1.1