ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves.

Browse Source
This commit is contained in:
Diva Canto
2009-08-13 14:10:12 -07:00
parent 6b9cc6c48d
commit 5246dc33dc
21 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@@ -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)
{

4
OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
View File

@@ -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;

8
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
View File

@@ -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");

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
View File

@@ -184,9 +184,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
/// <returns>true if the item was successfully deleted</returns>
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);
/// <summary>
/// Does the given user have an inventory structure?

8
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
View File

@@ -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);

8
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
View File

@@ -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);
}
/// <summary>

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
View File

@@ -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;

6
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@@ -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);