ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +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/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
View File

@@ -119,7 +119,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
{
InventoryItemBase item = new InventoryItemBase(itemID);
item.Owner = remoteClient.AgentId;
item = InventoryService.QueryItem(item);
item = InventoryService.GetItem(item);
//if (item == null)
//{ // Fetch the item
// item = new InventoryItemBase();

22
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <returns></returns>
public virtual UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data)
{
InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID));
InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
if (item != null)
{
@@ -315,7 +315,7 @@ namespace OpenSim.Region.Framework.Scenes
public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID,
UUID itemID, InventoryItemBase itemUpd)
{
InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID));
InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
if (item != null)
{
@@ -408,7 +408,7 @@ namespace OpenSim.Region.Framework.Scenes
{
Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem");
InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemId));
InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemId));
if ((item != null) && (item.Owner == senderId))
{
@@ -505,7 +505,7 @@ namespace OpenSim.Region.Framework.Scenes
UUID recipientId, UUID senderId, UUID folderId, UUID recipientParentFolderId)
{
//// Retrieve the folder from the sender
InventoryFolderBase folder = InventoryService.QueryFolder(new InventoryFolderBase(folderId));
InventoryFolderBase folder = InventoryService.GetFolder(new InventoryFolderBase(folderId));
if (null == folder)
{
m_log.ErrorFormat(
@@ -558,7 +558,7 @@ namespace OpenSim.Region.Framework.Scenes
if (item == null)
{
item = InventoryService.QueryItem(new InventoryItemBase(oldItemID));
item = InventoryService.GetItem(new InventoryItemBase(oldItemID));
if (item == null)
{
@@ -636,7 +636,7 @@ namespace OpenSim.Region.Framework.Scenes
m_log.DebugFormat(
"[AGENT INVENTORY]: Moving item {0} to {1} for {2}", itemID, folderID, remoteClient.AgentId);
InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID));
InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
if (item != null)
{
@@ -1224,7 +1224,7 @@ namespace OpenSim.Region.Framework.Scenes
UUID copyID = UUID.Random();
if (itemID != UUID.Zero)
{
InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID));
InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
// Try library
if (null == item)
@@ -1287,7 +1287,7 @@ namespace OpenSim.Region.Framework.Scenes
if (itemID != UUID.Zero) // transferred from an avatar inventory to the prim's inventory
{
InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID));
InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
// Try library
// XXX clumsy, possibly should be one call
@@ -1673,7 +1673,7 @@ namespace OpenSim.Region.Framework.Scenes
if (DeRezAction.SaveToExistingUserInventoryItem == action)
{
item = new InventoryItemBase(objectGroup.RootPart.FromUserInventoryItemID);
item = InventoryService.QueryItem(item);
item = InventoryService.GetItem(item);
//item = userInfo.RootFolder.FindItem(
// objectGroup.RootPart.FromUserInventoryItemID);
@@ -1834,7 +1834,7 @@ namespace OpenSim.Region.Framework.Scenes
string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup);
InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID));
InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
if (item != null)
{
@@ -1984,7 +1984,7 @@ namespace OpenSim.Region.Framework.Scenes
BypassRayCast, bRayEndIsIntersection,true,scale, false);
// Rez object
InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID));
InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
if (item != null)
{

4
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
View File

@@ -382,7 +382,7 @@ namespace OpenSim.Region.Framework.Scenes
return;
}
InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID));
InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
if (item != null)
{
@@ -516,7 +516,7 @@ namespace OpenSim.Region.Framework.Scenes
public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID)
{
InventoryFolderBase folder = new InventoryFolderBase(folderID);
folder = InventoryService.QueryFolder(folder);
folder = InventoryService.GetFolder(folder);
if (folder != null)
{
folder.ParentID = parentID;

24
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@@ -1020,11 +1020,11 @@ namespace OpenSim.Region.Framework.Scenes
public bool WaitForCallback(UUID id)
{
int count = 20;
int count = 200;
while (m_agentsInTransit.Contains(id) && count-- > 0)
{
//m_log.Debug(" >>> Waiting... " + count);
Thread.Sleep(1000);
Thread.Sleep(100);
}
if (count > 0)
@@ -1141,16 +1141,16 @@ namespace OpenSim.Region.Framework.Scenes
{
pos = pos + (agent.Velocity);
CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID);
if (userInfo != null)
{
userInfo.DropInventory();
}
else
{
m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}",
agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName);
}
//CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID);
//if (userInfo != null)
//{
// userInfo.DropInventory();
//}
//else
//{
// m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}",
// agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName);
//}
//bool crossingSuccessful =
// CrossToNeighbouringRegion(neighbourHandle, agent.ControllingClient.AgentId, pos,