aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-04 18:54:48 +0100
committerJustin Clark-Casey (justincc)2010-06-04 18:54:58 +0100
commitbdeda18b52f7ab37501f1751573e26e85656a4e4 (patch)
treef9b3a76e6f1e5d49f3ae2c56c269ddd9a23ae43c /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentFix bug where prim items were not loaded in the new sqlite database handler (diff)
downloadopensim-SC-bdeda18b52f7ab37501f1751573e26e85656a4e4.zip
opensim-SC-bdeda18b52f7ab37501f1751573e26e85656a4e4.tar.gz
opensim-SC-bdeda18b52f7ab37501f1751573e26e85656a4e4.tar.bz2
opensim-SC-bdeda18b52f7ab37501f1751573e26e85656a4e4.tar.xz
Revert "commit code which stops full updates being fired multiple times when attachments cross standalone region boundaries"
This reverts commit 5074d290e4aeb583560272cadc8ba09aa8337210. This gets rid of the massive amount of scene object log spam - sorry about that, folks
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs5
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index f556b35..a2634f7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2449,8 +2449,6 @@ 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");
2454 ScenePresence presence; 2452 ScenePresence presence;
2455 if (TryGetAvatar(remoteClient.AgentId, out presence)) 2453 if (TryGetAvatar(remoteClient.AgentId, out presence))
2456 { 2454 {
@@ -2458,12 +2456,9 @@ namespace OpenSim.Region.Framework.Scenes
2458 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 2456 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
2459 item = InventoryService.GetItem(item); 2457 item = InventoryService.GetItem(item);
2460 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); 2458 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
2461 Console.WriteLine("HERE Y");
2462 2459
2463 if (m_AvatarFactory != null) 2460 if (m_AvatarFactory != null)
2464 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance); 2461 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
2465
2466 Console.WriteLine("HERE Z");
2467 } 2462 }
2468 } 2463 }
2469 2464