aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs20
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs34
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs6
8 files changed, 47 insertions, 47 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
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index d8e604f..adc9496 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Framework.Scenes
124 { 124 {
125 if (((SceneObjectGroup)ent).LocalId == primLocalID) 125 if (((SceneObjectGroup)ent).LocalId == primLocalID)
126 { 126 {
127 m_log.DebugFormat("[SCENE]: Received full update request for {0} from {1}", primLocalID, remoteClient.Name); 127// m_log.DebugFormat("[SCENE]: Received full update request for {0} from {1}", primLocalID, remoteClient.Name);
128 ((SceneObjectGroup)ent).SendFullUpdateToClient(remoteClient); 128 ((SceneObjectGroup)ent).SendFullUpdateToClient(remoteClient);
129 return; 129 return;
130 } 130 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f8ca047..7089368 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2487,7 +2487,7 @@ namespace OpenSim.Region.Framework.Scenes
2487 /// <returns></returns> 2487 /// <returns></returns>
2488 public bool IncomingCreateObject(ISceneObject sog) 2488 public bool IncomingCreateObject(ISceneObject sog)
2489 { 2489 {
2490 m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted); 2490// m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted);
2491 SceneObjectGroup newObject; 2491 SceneObjectGroup newObject;
2492 try 2492 try
2493 { 2493 {
@@ -2559,7 +2559,7 @@ namespace OpenSim.Region.Framework.Scenes
2559 2559
2560 if (sceneObject.IsAttachmentCheckFull()) // Attachment 2560 if (sceneObject.IsAttachmentCheckFull()) // Attachment
2561 { 2561 {
2562 m_log.DebugFormat("[SCENE]: Adding attachment {0} {1}", sceneObject.Name, sceneObject.LocalId); 2562// m_log.DebugFormat("[SCENE]: Adding attachment {0} {1}", sceneObject.Name, sceneObject.LocalId);
2563 2563
2564 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez); 2564 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
2565 sceneObject.RootPart.AddFlag(PrimFlags.Phantom); 2565 sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
@@ -2572,7 +2572,7 @@ namespace OpenSim.Region.Framework.Scenes
2572 // Fix up attachment Parent Local ID 2572 // Fix up attachment Parent Local ID
2573 ScenePresence sp = GetScenePresence(sceneObject.OwnerID); 2573 ScenePresence sp = GetScenePresence(sceneObject.OwnerID);
2574 2574
2575 Console.WriteLine("AAAA"); 2575// Console.WriteLine("AAAA");
2576 2576
2577 //uint parentLocalID = 0; 2577 //uint parentLocalID = 0;
2578 if (sp != null) 2578 if (sp != null)
@@ -2605,11 +2605,11 @@ namespace OpenSim.Region.Framework.Scenes
2605 RootPrim.AddFlag(PrimFlags.TemporaryOnRez); 2605 RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
2606 } 2606 }
2607 2607
2608 Console.WriteLine("BBBB"); 2608// Console.WriteLine("BBBB");
2609 } 2609 }
2610 else 2610 else
2611 { 2611 {
2612 m_log.DebugFormat("[SCENE]: Adding ordinary object {0} {1}", sceneObject.Name, sceneObject.LocalId); 2612// m_log.DebugFormat("[SCENE]: Adding ordinary object {0} {1}", sceneObject.Name, sceneObject.LocalId);
2613 2613
2614 AddRestoredSceneObject(sceneObject, true, false); 2614 AddRestoredSceneObject(sceneObject, true, false);
2615 2615
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 50feb17..67fa13d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1383,9 +1383,9 @@ namespace OpenSim.Region.Framework.Scenes
1383 // now we have a child agent in this region. Request all interesting data about other (root) agents 1383 // now we have a child agent in this region. Request all interesting data about other (root) agents
1384 agent.SendInitialFullUpdateToAllClients(); 1384 agent.SendInitialFullUpdateToAllClients();
1385 1385
1386 Console.WriteLine("SCS 1"); 1386// Console.WriteLine("SCS 1");
1387 agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true); 1387 agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true);
1388 Console.WriteLine("SCS 2"); 1388// Console.WriteLine("SCS 2");
1389 1389
1390 // m_scene.SendKillObject(m_localId); 1390 // m_scene.SendKillObject(m_localId);
1391 1391
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index fa3c5eb..bdab696 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -636,13 +636,13 @@ namespace OpenSim.Region.Framework.Scenes
636 protected internal bool AttachObject( 636 protected internal bool AttachObject(
637 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent) 637 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
638 { 638 {
639 Console.WriteLine("HERE A"); 639// Console.WriteLine("HERE A");
640 SceneObjectGroup group = GetGroupByPrim(objectLocalID); 640 SceneObjectGroup group = GetGroupByPrim(objectLocalID);
641 if (group != null) 641 if (group != null)
642 { 642 {
643 if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) 643 if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
644 { 644 {
645 Console.WriteLine("HERE -1"); 645// Console.WriteLine("HERE -1");
646 // If the attachment point isn't the same as the one previously used 646 // If the attachment point isn't the same as the one previously used
647 // set it's offset position = 0 so that it appears on the attachment point 647 // set it's offset position = 0 so that it appears on the attachment point
648 // and not in a weird location somewhere unknown. 648 // and not in a weird location somewhere unknown.
@@ -681,12 +681,12 @@ namespace OpenSim.Region.Framework.Scenes
681 itemId = group.GetFromItemID(); 681 itemId = group.GetFromItemID();
682 } 682 }
683 683
684 Console.WriteLine("HERE 0"); 684// Console.WriteLine("HERE 0");
685 m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); 685 m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group);
686 686
687 Console.WriteLine("HERE 1"); 687// Console.WriteLine("HERE 1");
688 group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent); 688 group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
689 Console.WriteLine("HERE 2"); 689// Console.WriteLine("HERE 2");
690 // In case it is later dropped again, don't let 690 // In case it is later dropped again, don't let
691 // it get cleaned up 691 // it get cleaned up
692 // 692 //
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ba3fde7..451c6f9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1494,9 +1494,9 @@ namespace OpenSim.Region.Framework.Scenes
1494 1494
1495 public void SendFullUpdateToClient(IClientAPI remoteClient) 1495 public void SendFullUpdateToClient(IClientAPI remoteClient)
1496 { 1496 {
1497 if (IsAttachment) 1497// if (IsAttachment)
1498 m_log.DebugFormat( 1498// m_log.DebugFormat(
1499 "[SOG]: Sending full update to client {0} for {1} {2}", remoteClient.Name, Name, LocalId); 1499// "[SOG]: Sending full update to client {0} for {1} {2}", remoteClient.Name, Name, LocalId);
1500 1500
1501 SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID)); 1501 SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID));
1502 1502
@@ -1517,9 +1517,9 @@ namespace OpenSim.Region.Framework.Scenes
1517 /// <param name="part"></param> 1517 /// <param name="part"></param>
1518 internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags) 1518 internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags)
1519 { 1519 {
1520 if (IsAttachment) 1520// if (IsAttachment)
1521 m_log.DebugFormat( 1521// m_log.DebugFormat(
1522 "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId); 1522// "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
1523 1523
1524 if (m_rootPart.UUID == part.UUID) 1524 if (m_rootPart.UUID == part.UUID)
1525 { 1525 {
@@ -1999,8 +1999,8 @@ namespace OpenSim.Region.Framework.Scenes
1999 1999
2000 public void ScheduleFullUpdateToAvatar(ScenePresence presence) 2000 public void ScheduleFullUpdateToAvatar(ScenePresence presence)
2001 { 2001 {
2002 if (IsAttachment) 2002// if (IsAttachment)
2003 m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name); 2003// m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name);
2004 2004
2005 RootPart.AddFullUpdateToAvatar(presence); 2005 RootPart.AddFullUpdateToAvatar(presence);
2006 2006
@@ -2032,8 +2032,8 @@ namespace OpenSim.Region.Framework.Scenes
2032 /// </summary> 2032 /// </summary>
2033 public void ScheduleGroupForFullUpdate() 2033 public void ScheduleGroupForFullUpdate()
2034 { 2034 {
2035 if (IsAttachment) 2035// if (IsAttachment)
2036 m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID); 2036// m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID);
2037 2037
2038 checkAtTargets(); 2038 checkAtTargets();
2039 RootPart.ScheduleFullUpdate(); 2039 RootPart.ScheduleFullUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ffbb427..33624a2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1267,8 +1267,8 @@ namespace OpenSim.Region.Framework.Scenes
1267 1267
1268 public void AddFullUpdateToAvatar(ScenePresence presence) 1268 public void AddFullUpdateToAvatar(ScenePresence presence)
1269 { 1269 {
1270 if (IsAttachment) 1270// if (IsAttachment)
1271 m_log.DebugFormat("AddFullUpdateToAllAvatar() {0} for {1} {2}", presence.Name, Name, LocalId); 1271// m_log.DebugFormat("AddFullUpdateToAllAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
1272 1272
1273 presence.SceneViewer.QueuePartForUpdate(this); 1273 presence.SceneViewer.QueuePartForUpdate(this);
1274 } 1274 }
@@ -1293,8 +1293,8 @@ namespace OpenSim.Region.Framework.Scenes
1293 1293
1294 public void AddTerseUpdateToAvatar(ScenePresence presence) 1294 public void AddTerseUpdateToAvatar(ScenePresence presence)
1295 { 1295 {
1296 if (IsAttachment) 1296// if (IsAttachment)
1297 m_log.DebugFormat("AddTerseUpdateToAvatar() {0} for {1} {2}", presence.Name, Name, LocalId); 1297// m_log.DebugFormat("AddTerseUpdateToAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
1298 1298
1299 presence.SceneViewer.QueuePartForUpdate(this); 1299 presence.SceneViewer.QueuePartForUpdate(this);
1300 } 1300 }
@@ -2729,8 +2729,8 @@ namespace OpenSim.Region.Framework.Scenes
2729 /// </summary> 2729 /// </summary>
2730 public void ScheduleFullUpdate() 2730 public void ScheduleFullUpdate()
2731 { 2731 {
2732 if (IsAttachment) 2732// if (IsAttachment)
2733 m_log.DebugFormat("[SOP]: Scheduling full update for {0} {1}", Name, LocalId); 2733// m_log.DebugFormat("[SOP]: Scheduling full update for {0} {1}", Name, LocalId);
2734 2734
2735 if (m_parentGroup != null) 2735 if (m_parentGroup != null)
2736 { 2736 {
@@ -2843,9 +2843,9 @@ namespace OpenSim.Region.Framework.Scenes
2843 /// <param name="remoteClient"></param> 2843 /// <param name="remoteClient"></param>
2844 public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags) 2844 public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
2845 { 2845 {
2846 if (IsAttachment) 2846// if (IsAttachment)
2847 m_log.DebugFormat( 2847// m_log.DebugFormat(
2848 "[SCENE OBJECT PART]: Sending part full update to {0} for {1} {2}", remoteClient.Name, Name, LocalId); 2848// "[SCENE OBJECT PART]: Sending part full update to {0} for {1} {2}", remoteClient.Name, Name, LocalId);
2849 2849
2850 m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags); 2850 m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags);
2851 } 2851 }
@@ -2855,9 +2855,9 @@ namespace OpenSim.Region.Framework.Scenes
2855 /// </summary> 2855 /// </summary>
2856 public void SendFullUpdateToAllClients() 2856 public void SendFullUpdateToAllClients()
2857 { 2857 {
2858 if (IsAttachment) 2858// if (IsAttachment)
2859 m_log.DebugFormat( 2859// m_log.DebugFormat(
2860 "[SCENE OBJECT PART]: Sending full update for {0} {1} for all clients", Name, LocalId); 2860// "[SCENE OBJECT PART]: Sending full update for {0} {1} for all clients", Name, LocalId);
2861 2861
2862 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 2862 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
2863 for (int i = 0; i < avatars.Length; i++) 2863 for (int i = 0; i < avatars.Length; i++)
@@ -2870,9 +2870,9 @@ namespace OpenSim.Region.Framework.Scenes
2870 2870
2871 public void SendFullUpdateToAllClientsExcept(UUID agentID) 2871 public void SendFullUpdateToAllClientsExcept(UUID agentID)
2872 { 2872 {
2873 if (IsAttachment) 2873// if (IsAttachment)
2874 m_log.DebugFormat( 2874// m_log.DebugFormat(
2875 "[SCENE OBJECT PART]: Sending full update for {0} {1} to all clients except {2}", Name, LocalId, agentID); 2875// "[SCENE OBJECT PART]: Sending full update for {0} {1} to all clients except {2}", Name, LocalId, agentID);
2876 2876
2877 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 2877 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
2878 for (int i = 0; i < avatars.Length; i++) 2878 for (int i = 0; i < avatars.Length; i++)
@@ -2980,8 +2980,8 @@ namespace OpenSim.Region.Framework.Scenes
2980 { 2980 {
2981 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes 2981 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
2982 { 2982 {
2983 if (IsAttachment) 2983// if (IsAttachment)
2984 m_log.DebugFormat("[SOP]: Sending scheduled full update for {0} {1}", Name, LocalId); 2984// m_log.DebugFormat("[SOP]: Sending scheduled full update for {0} {1}", Name, LocalId);
2985 2985
2986 AddFullUpdateToAllAvatars(); 2986 AddFullUpdateToAllAvatars();
2987 ClearUpdateSchedule(); 2987 ClearUpdateSchedule();
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 6f2bef9..23663dd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -63,8 +63,8 @@ namespace OpenSim.Region.Framework.Scenes
63 /// <param name="part"></param> 63 /// <param name="part"></param>
64 public void QueuePartForUpdate(SceneObjectPart part) 64 public void QueuePartForUpdate(SceneObjectPart part)
65 { 65 {
66 if (part.IsAttachment) 66// if (part.IsAttachment)
67 m_log.DebugFormat("[SCENE VIEWER]: Queueing part {0} {1} for update", part.Name, part.LocalId); 67// m_log.DebugFormat("[SCENE VIEWER]: Queueing part {0} {1} for update", part.Name, part.LocalId);
68 68
69 lock (m_partsUpdateQueue) 69 lock (m_partsUpdateQueue)
70 { 70 {