aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-08 15:50:21 +0100
committerJustin Clark-Casey (justincc)2010-06-08 15:50:21 +0100
commita160b44e0766329a6c336adcb804cede39e00fc7 (patch)
treeedf6d5070a0bb9dcba424cf883fe20a7c96af751 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentIf a transfer request is received for a task inventory item asset, then route... (diff)
parentminor: remove some commented out code and return ScenePresence.UpdatePriority... (diff)
downloadopensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.zip
opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.gz
opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.bz2
opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.xz
Merge branch '0.6.9-post-fixes' into share-with-group
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 26d3372..79b3cfd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2450,6 +2450,8 @@ namespace OpenSim.Region.Framework.Scenes
2450 return; 2450 return;
2451 } 2451 }
2452 2452
2453// m_log.DebugFormat("[SCENE INVENTORY]: {0} {1} IsAttachment={2}", att.Name, att.LocalId, att.IsAttachment);
2454// Console.WriteLine("HERE X");
2453 ScenePresence presence; 2455 ScenePresence presence;
2454 if (TryGetAvatar(remoteClient.AgentId, out presence)) 2456 if (TryGetAvatar(remoteClient.AgentId, out presence))
2455 { 2457 {
@@ -2457,9 +2459,12 @@ namespace OpenSim.Region.Framework.Scenes
2457 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 2459 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
2458 item = InventoryService.GetItem(item); 2460 item = InventoryService.GetItem(item);
2459 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); 2461 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
2462// Console.WriteLine("HERE Y");
2460 2463
2461 if (m_AvatarFactory != null) 2464 if (m_AvatarFactory != null)
2462 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance); 2465 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
2466
2467// Console.WriteLine("HERE Z");
2463 } 2468 }
2464 } 2469 }
2465 2470
@@ -2642,4 +2647,4 @@ namespace OpenSim.Region.Framework.Scenes
2642 m_sceneGraph.LinkObjects(root, children); 2647 m_sceneGraph.LinkObjects(root, children);
2643 } 2648 }
2644 } 2649 }
2645} 2650} \ No newline at end of file