aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
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/Framework
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/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs22
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs24
4 files changed, 26 insertions, 26 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index 1b93f46..dd6928f 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
119 { 119 {
120 InventoryItemBase item = new InventoryItemBase(itemID); 120 InventoryItemBase item = new InventoryItemBase(itemID);
121 item.Owner = remoteClient.AgentId; 121 item.Owner = remoteClient.AgentId;
122 item = InventoryService.QueryItem(item); 122 item = InventoryService.GetItem(item);
123 //if (item == null) 123 //if (item == null)
124 //{ // Fetch the item 124 //{ // Fetch the item
125 // item = new InventoryItemBase(); 125 // item = new InventoryItemBase();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index cd91e8c..a941a74 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
140 /// <returns></returns> 140 /// <returns></returns>
141 public virtual UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data) 141 public virtual UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data)
142 { 142 {
143 InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); 143 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
144 144
145 if (item != null) 145 if (item != null)
146 { 146 {
@@ -315,7 +315,7 @@ namespace OpenSim.Region.Framework.Scenes
315 public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID, 315 public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID,
316 UUID itemID, InventoryItemBase itemUpd) 316 UUID itemID, InventoryItemBase itemUpd)
317 { 317 {
318 InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); 318 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
319 319
320 if (item != null) 320 if (item != null)
321 { 321 {
@@ -408,7 +408,7 @@ namespace OpenSim.Region.Framework.Scenes
408 { 408 {
409 Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem"); 409 Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem");
410 410
411 InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemId)); 411 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemId));
412 412
413 if ((item != null) && (item.Owner == senderId)) 413 if ((item != null) && (item.Owner == senderId))
414 { 414 {
@@ -505,7 +505,7 @@ namespace OpenSim.Region.Framework.Scenes
505 UUID recipientId, UUID senderId, UUID folderId, UUID recipientParentFolderId) 505 UUID recipientId, UUID senderId, UUID folderId, UUID recipientParentFolderId)
506 { 506 {
507 //// Retrieve the folder from the sender 507 //// Retrieve the folder from the sender
508 InventoryFolderBase folder = InventoryService.QueryFolder(new InventoryFolderBase(folderId)); 508 InventoryFolderBase folder = InventoryService.GetFolder(new InventoryFolderBase(folderId));
509 if (null == folder) 509 if (null == folder)
510 { 510 {
511 m_log.ErrorFormat( 511 m_log.ErrorFormat(
@@ -558,7 +558,7 @@ namespace OpenSim.Region.Framework.Scenes
558 558
559 if (item == null) 559 if (item == null)
560 { 560 {
561 item = InventoryService.QueryItem(new InventoryItemBase(oldItemID)); 561 item = InventoryService.GetItem(new InventoryItemBase(oldItemID));
562 562
563 if (item == null) 563 if (item == null)
564 { 564 {
@@ -636,7 +636,7 @@ namespace OpenSim.Region.Framework.Scenes
636 m_log.DebugFormat( 636 m_log.DebugFormat(
637 "[AGENT INVENTORY]: Moving item {0} to {1} for {2}", itemID, folderID, remoteClient.AgentId); 637 "[AGENT INVENTORY]: Moving item {0} to {1} for {2}", itemID, folderID, remoteClient.AgentId);
638 638
639 InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); 639 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
640 640
641 if (item != null) 641 if (item != null)
642 { 642 {
@@ -1224,7 +1224,7 @@ namespace OpenSim.Region.Framework.Scenes
1224 UUID copyID = UUID.Random(); 1224 UUID copyID = UUID.Random();
1225 if (itemID != UUID.Zero) 1225 if (itemID != UUID.Zero)
1226 { 1226 {
1227 InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); 1227 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
1228 1228
1229 // Try library 1229 // Try library
1230 if (null == item) 1230 if (null == item)
@@ -1287,7 +1287,7 @@ namespace OpenSim.Region.Framework.Scenes
1287 1287
1288 if (itemID != UUID.Zero) // transferred from an avatar inventory to the prim's inventory 1288 if (itemID != UUID.Zero) // transferred from an avatar inventory to the prim's inventory
1289 { 1289 {
1290 InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); 1290 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
1291 1291
1292 // Try library 1292 // Try library
1293 // XXX clumsy, possibly should be one call 1293 // XXX clumsy, possibly should be one call
@@ -1673,7 +1673,7 @@ namespace OpenSim.Region.Framework.Scenes
1673 if (DeRezAction.SaveToExistingUserInventoryItem == action) 1673 if (DeRezAction.SaveToExistingUserInventoryItem == action)
1674 { 1674 {
1675 item = new InventoryItemBase(objectGroup.RootPart.FromUserInventoryItemID); 1675 item = new InventoryItemBase(objectGroup.RootPart.FromUserInventoryItemID);
1676 item = InventoryService.QueryItem(item); 1676 item = InventoryService.GetItem(item);
1677 1677
1678 //item = userInfo.RootFolder.FindItem( 1678 //item = userInfo.RootFolder.FindItem(
1679 // objectGroup.RootPart.FromUserInventoryItemID); 1679 // objectGroup.RootPart.FromUserInventoryItemID);
@@ -1834,7 +1834,7 @@ namespace OpenSim.Region.Framework.Scenes
1834 1834
1835 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup); 1835 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup);
1836 1836
1837 InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); 1837 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
1838 1838
1839 if (item != null) 1839 if (item != null)
1840 { 1840 {
@@ -1984,7 +1984,7 @@ namespace OpenSim.Region.Framework.Scenes
1984 BypassRayCast, bRayEndIsIntersection,true,scale, false); 1984 BypassRayCast, bRayEndIsIntersection,true,scale, false);
1985 1985
1986 // Rez object 1986 // Rez object
1987 InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); 1987 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
1988 1988
1989 if (item != null) 1989 if (item != null)
1990 { 1990 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index e2debe5..bcc9bcb 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -382,7 +382,7 @@ namespace OpenSim.Region.Framework.Scenes
382 return; 382 return;
383 } 383 }
384 384
385 InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); 385 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID));
386 386
387 if (item != null) 387 if (item != null)
388 { 388 {
@@ -516,7 +516,7 @@ namespace OpenSim.Region.Framework.Scenes
516 public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) 516 public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID)
517 { 517 {
518 InventoryFolderBase folder = new InventoryFolderBase(folderID); 518 InventoryFolderBase folder = new InventoryFolderBase(folderID);
519 folder = InventoryService.QueryFolder(folder); 519 folder = InventoryService.GetFolder(folder);
520 if (folder != null) 520 if (folder != null)
521 { 521 {
522 folder.ParentID = parentID; 522 folder.ParentID = parentID;
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index af2753c..f28352c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1020,11 +1020,11 @@ namespace OpenSim.Region.Framework.Scenes
1020 1020
1021 public bool WaitForCallback(UUID id) 1021 public bool WaitForCallback(UUID id)
1022 { 1022 {
1023 int count = 20; 1023 int count = 200;
1024 while (m_agentsInTransit.Contains(id) && count-- > 0) 1024 while (m_agentsInTransit.Contains(id) && count-- > 0)
1025 { 1025 {
1026 //m_log.Debug(" >>> Waiting... " + count); 1026 //m_log.Debug(" >>> Waiting... " + count);
1027 Thread.Sleep(1000); 1027 Thread.Sleep(100);
1028 } 1028 }
1029 1029
1030 if (count > 0) 1030 if (count > 0)
@@ -1141,16 +1141,16 @@ namespace OpenSim.Region.Framework.Scenes
1141 { 1141 {
1142 pos = pos + (agent.Velocity); 1142 pos = pos + (agent.Velocity);
1143 1143
1144 CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID); 1144 //CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID);
1145 if (userInfo != null) 1145 //if (userInfo != null)
1146 { 1146 //{
1147 userInfo.DropInventory(); 1147 // userInfo.DropInventory();
1148 } 1148 //}
1149 else 1149 //else
1150 { 1150 //{
1151 m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}", 1151 // m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}",
1152 agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName); 1152 // agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName);
1153 } 1153 //}
1154 1154
1155 //bool crossingSuccessful = 1155 //bool crossingSuccessful =
1156 // CrossToNeighbouringRegion(neighbourHandle, agent.ControllingClient.AgentId, pos, 1156 // CrossToNeighbouringRegion(neighbourHandle, agent.ControllingClient.AgentId, pos,