From bdeda18b52f7ab37501f1751573e26e85656a4e4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Jun 2010 18:54:48 +0100
Subject: 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
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 34 +++++-----------------
 1 file changed, 8 insertions(+), 26 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ffbb427..a85a4b3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1259,17 +1259,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// Tell all scene presences that they should send updates for this part to their clients
         /// </summary>
         public void AddFullUpdateToAllAvatars()
-        {                        
+        {
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
-                AddFullUpdateToAvatar(avatars[i]);
+            {
+                avatars[i].SceneViewer.QueuePartForUpdate(this);
+            }
         }
 
         public void AddFullUpdateToAvatar(ScenePresence presence)
         {
-            if (IsAttachment)
-                m_log.DebugFormat("AddFullUpdateToAllAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
-            
             presence.SceneViewer.QueuePartForUpdate(this);
         }
 
@@ -1288,14 +1287,13 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
-                AddTerseUpdateToAvatar(avatars[i]);
+            {
+                avatars[i].SceneViewer.QueuePartForUpdate(this);
+            }
         }
 
         public void AddTerseUpdateToAvatar(ScenePresence presence)
         {
-            if (IsAttachment)
-                m_log.DebugFormat("AddTerseUpdateToAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
-            
             presence.SceneViewer.QueuePartForUpdate(this);
         }
 
@@ -2729,8 +2727,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void ScheduleFullUpdate()
         {
-            if (IsAttachment)
-                m_log.DebugFormat("[SOP]: Scheduling full update for {0} {1}", Name, LocalId);
+//            m_log.DebugFormat("[SCENE OBJECT PART]: Scheduling full update for {0} {1}", Name, LocalId);
             
             if (m_parentGroup != null)
             {
@@ -2843,10 +2840,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="remoteClient"></param>
         public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
         {
-            if (IsAttachment)
-                m_log.DebugFormat(
-                    "[SCENE OBJECT PART]: Sending part full update to {0} for {1} {2}", remoteClient.Name, Name, LocalId);
-            
             m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags);
         }
 
@@ -2855,10 +2848,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void SendFullUpdateToAllClients()
         {
-            if (IsAttachment)
-                m_log.DebugFormat(
-                    "[SCENE OBJECT PART]: Sending full update for {0} {1} for all clients", Name, LocalId);
-            
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
             {
@@ -2870,10 +2859,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SendFullUpdateToAllClientsExcept(UUID agentID)
         {
-            if (IsAttachment)
-                m_log.DebugFormat(
-                    "[SCENE OBJECT PART]: Sending full update for {0} {1} to all clients except {2}", Name, LocalId, agentID);
-            
             ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
             for (int i = 0; i < avatars.Length; i++)
             {
@@ -2980,9 +2965,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
                 {
-                    if (IsAttachment)
-                        m_log.DebugFormat("[SOP]: Sending scheduled full update for {0} {1}", Name, LocalId);
-                    
                     AddFullUpdateToAllAvatars();
                     ClearUpdateSchedule();
                 }
-- 
cgit v1.1