From be50fa76eeedde077c752e726f1480d62d636b3d Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 18 Jan 2008 18:43:16 +0000
Subject: Change SOP.HasChanged to HasPrimChanged in preparation for further
 changes

---
 .../Environment/Scenes/SceneObjectGroup.Inventory.cs |  6 +++---
 .../Region/Environment/Scenes/SceneObjectGroup.cs    | 20 ++++++++++++--------
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index c7f5852..8320c79 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Region.Environment.Scenes
                 // persistence thread visits this object.  In the future, changes can be signalled at a more
                 // granular level, or we could let the datastore worry about whether prims have really 
                 // changed since they were last persisted.
-                HasChanged = true;
+                HasPrimChanged = true;
                 
                 return true;
             }
@@ -241,7 +241,7 @@ namespace OpenSim.Region.Environment.Scenes
                 // persistence thread visits this object.  In the future, changes can be signalled at a more
                 // granular level, or we could let the datastore worry about whether prims have really 
                 // changed since they were last persisted.
-                HasChanged = true;                
+                HasPrimChanged = true;                
                 
                 return true;
             }
@@ -268,7 +268,7 @@ namespace OpenSim.Region.Environment.Scenes
                 // persistence thread visits this object.  In the future, changes can be signalled at a more
                 // granular level, or we could let the datastore worry about whether prims have really 
                 // changed since they were last persisted.
-                HasChanged = true;
+                HasPrimChanged = true;
                 
                 return type;
             }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 5790591..77841eb 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -55,7 +55,11 @@ namespace OpenSim.Region.Environment.Scenes
 
         public event PrimCountTaintedDelegate OnPrimCountTainted;
 
-        public bool HasChanged = false;
+        /// <summary>
+        /// Signal whether the prim's non-inventory attributes have changed 
+        /// since its last persistent backup
+        /// </summary>
+        public bool HasPrimChanged = false;
 
         private LLVector3 lastPhysGroupPos;
         private LLQuaternion lastPhysGroupRot;
@@ -728,7 +732,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void ScheduleGroupForFullUpdate()
         {
-            HasChanged = true;
+            HasPrimChanged = true;
             foreach (SceneObjectPart part in m_parts.Values)
             {
                 part.ScheduleFullUpdate();
@@ -740,7 +744,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void ScheduleGroupForTerseUpdate()
         {
-            HasChanged = true;
+            HasPrimChanged = true;
             foreach (SceneObjectPart part in m_parts.Values)
             {
                 part.ScheduleTerseUpdate();
@@ -752,7 +756,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void SendGroupFullUpdate()
         {
-            HasChanged = true;
+            HasPrimChanged = true;
             foreach (SceneObjectPart part in m_parts.Values)
             {
                 part.SendFullUpdateToAllClients();
@@ -764,7 +768,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void SendGroupTerseUpdate()
         {
-            HasChanged = true;
+            HasPrimChanged = true;
             foreach (SceneObjectPart part in m_parts.Values)
             {
                 part.SendTerseUpdateToAllClients();
@@ -1483,10 +1487,10 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="datastore"></param>
         public void ProcessBackup(IRegionDataStore datastore)
         {
-            if (HasChanged)
+            if (HasPrimChanged)
             {
                 datastore.StoreObject(this, m_scene.RegionInfo.RegionID);
-                HasChanged = false;
+                HasPrimChanged = false;
             }
         }
 
@@ -1598,7 +1602,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void ResetChildPrimPhysicsPositions()
         {
             AbsolutePosition = AbsolutePosition;
-            HasChanged = false;
+            HasPrimChanged = false;
         }
 
         public LLUUID GetPartsFullID(uint localID)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 20e761f..930801c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1089,7 +1089,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (m_parentGroup != null)
             {
-                m_parentGroup.HasChanged = true;
+                m_parentGroup.HasPrimChanged = true;
             }
             TimeStampFull = (uint) Util.UnixTimeSinceEpoch();
             m_updateFlag = 2;
@@ -1130,7 +1130,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (m_parentGroup != null)
                 {
-                    m_parentGroup.HasChanged = true;
+                    m_parentGroup.HasPrimChanged = true;
                 }
                 TimeStampTerse = (uint) Util.UnixTimeSinceEpoch();
                 m_updateFlag = 1;
-- 
cgit v1.1