aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-07 16:07:43 +0100
committerJustin Clark-Casey (justincc)2010-06-07 19:14:30 +0100
commit693b5d08381a7672b3ebeb693ee50a82e8e59125 (patch)
tree53ad7a345866b29f0b23c5c8a116e6587a5d8e9e /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentcommit code which stops full updates being fired multiple times when attachme... (diff)
downloadopensim-SC-693b5d08381a7672b3ebeb693ee50a82e8e59125.zip
opensim-SC-693b5d08381a7672b3ebeb693ee50a82e8e59125.tar.gz
opensim-SC-693b5d08381a7672b3ebeb693ee50a82e8e59125.tar.bz2
opensim-SC-693b5d08381a7672b3ebeb693ee50a82e8e59125.tar.xz
reapply fix for double sending of attachment update on standalone region crossing
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index f556b35..a11b1f1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2449,8 +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); 2452// m_log.DebugFormat("[SCENE INVENTORY]: {0} {1} IsAttachment={2}", att.Name, att.LocalId, att.IsAttachment);
2453 Console.WriteLine("HERE X"); 2453// Console.WriteLine("HERE X");
2454 ScenePresence presence; 2454 ScenePresence presence;
2455 if (TryGetAvatar(remoteClient.AgentId, out presence)) 2455 if (TryGetAvatar(remoteClient.AgentId, out presence))
2456 { 2456 {
@@ -2458,12 +2458,12 @@ namespace OpenSim.Region.Framework.Scenes
2458 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 2458 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
2459 item = InventoryService.GetItem(item); 2459 item = InventoryService.GetItem(item);
2460 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"); 2461// Console.WriteLine("HERE Y");
2462 2462
2463 if (m_AvatarFactory != null) 2463 if (m_AvatarFactory != null)
2464 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance); 2464 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
2465 2465
2466 Console.WriteLine("HERE Z"); 2466// Console.WriteLine("HERE Z");
2467 } 2467 }
2468 } 2468 }
2469 2469