aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-05-27 21:35:17 +0100
committerJustin Clark-Casey (justincc)2010-05-27 21:35:17 +0100
commit5074d290e4aeb583560272cadc8ba09aa8337210 (patch)
treeef8df109755e6958b071adfaf31ccf283d4a4b76 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentbackport from master fix for attachment display (diff)
downloadopensim-SC-5074d290e4aeb583560272cadc8ba09aa8337210.zip
opensim-SC-5074d290e4aeb583560272cadc8ba09aa8337210.tar.gz
opensim-SC-5074d290e4aeb583560272cadc8ba09aa8337210.tar.bz2
opensim-SC-5074d290e4aeb583560272cadc8ba09aa8337210.tar.xz
commit code which stops full updates being fired multiple times when attachments cross standalone region boundaries
lots of messy debug code here too which would need to be removed
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 42a748f..aa724c5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2449,6 +2449,8 @@ namespace OpenSim.Region.Framework.Scenes
2449 return; 2449 return;
2450 } 2450 }
2451 2451
2452 m_log.DebugFormat("[SCENE INVENTORY]: {0} {1} IsAttachment={2}", att.Name, att.LocalId, att.IsAttachment);
2453 Console.WriteLine("HERE X");
2452 ScenePresence presence; 2454 ScenePresence presence;
2453 if (TryGetAvatar(remoteClient.AgentId, out presence)) 2455 if (TryGetAvatar(remoteClient.AgentId, out presence))
2454 { 2456 {
@@ -2456,9 +2458,12 @@ namespace OpenSim.Region.Framework.Scenes
2456 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 2458 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
2457 item = InventoryService.GetItem(item); 2459 item = InventoryService.GetItem(item);
2458 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); 2460 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
2461 Console.WriteLine("HERE Y");
2459 2462
2460 if (m_AvatarFactory != null) 2463 if (m_AvatarFactory != null)
2461 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance); 2464 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
2465
2466 Console.WriteLine("HERE Z");
2462 } 2467 }
2463 } 2468 }
2464 2469