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 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/CoreModules/Avatar') 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"); -- cgit v1.1