From f8bf6c2cc462014af7ae2f3ae91e9b7b0ef1d180 Mon Sep 17 00:00:00 2001
From: "Huaiyu (Kitty) Liu" <huaiyu.liu@intel.com>
Date: Tue, 3 May 2011 13:37:55 -0700
Subject: [PATCH] Removed a few debug messages from previous commit, then the
 problem shows up again. It seems due to the script engine, after rezzing the
 pebbles and changing their shapes, the cached values in RegionSyncModule not
 properly sync'ed with SOP's data.

---
 .../RegionSyncModule/SymmetricSync/RegionSyncModule.cs       | 5 ++++-
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs           | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
index a4fcdf77c5..5972caa186 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
@@ -2409,7 +2409,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
             if (propertiesSyncInfo.Count>0)
             {
                 //SYNC DEBUG
-                
+                /*
                 string pString = "";
                 foreach (PropertySyncInfo p in propertiesSyncInfo)
                 {
@@ -2420,6 +2420,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
                         m_log.DebugFormat("Shape to be changed on SOP {0}, {1} to ProfileShape {2}", sop.Name, sop.UUID, shape.ProfileShape);
                     }
                 }
+                 * */ 
                  
                  
                 //m_log.DebugFormat("ms {0}: HandleUpdatedPrimProperties, for prim {1},{2} with updated properties -- {3}", DateTime.Now.Millisecond, sop.Name, sop.UUID, pString);
@@ -4979,10 +4980,12 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
             HashSet<SceneObjectPartSyncProperties> propertiesUpdatedByLocal = new HashSet<SceneObjectPartSyncProperties>();
 
             //DSG DEBUG
+            /*
             if (propertiesToBeSynced.Contains(SceneObjectPartSyncProperties.Shape))
             {
                 DebugLog.DebugFormat("UpdatePropertiesByLocal: to update cache of SOP {0}, {1} Shape to {2}", part.Name, part.UUID, part.Shape.ProfileShape);
             }
+             * */ 
 
             lock (m_primSyncInfoLock)
             {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 04129a5fd0..1270533138 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4652,7 +4652,7 @@ namespace OpenSim.Region.Framework.Scenes
             //ScheduleFullUpdate();
 
             //DSG DEBUG
-            m_log.DebugFormat("{0}, {1}: shaped updated to {2}, calling ScheduleFullUpdate.", Name, UUID, Shape.ProfileShape);
+            //m_log.DebugFormat("{0}, {1}: shaped updated to {2}, calling ScheduleFullUpdate.", Name, UUID, Shape.ProfileShape);
 
             ScheduleFullUpdate(new List<SceneObjectPartSyncProperties>() {SceneObjectPartSyncProperties.Shape});
         }