aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-01-18 18:43:16 +0000
committerJustin Clarke Casey2008-01-18 18:43:16 +0000
commitbe50fa76eeedde077c752e726f1480d62d636b3d (patch)
treec8e77fc7053e34d0fd491a5a59ad5ba3ab97deee
parent* Fixed bug where 'taskOwnerId' would always be null in PermissionManager, he... (diff)
downloadopensim-SC_OLD-be50fa76eeedde077c752e726f1480d62d636b3d.zip
opensim-SC_OLD-be50fa76eeedde077c752e726f1480d62d636b3d.tar.gz
opensim-SC_OLD-be50fa76eeedde077c752e726f1480d62d636b3d.tar.bz2
opensim-SC_OLD-be50fa76eeedde077c752e726f1480d62d636b3d.tar.xz
Change SOP.HasChanged to HasPrimChanged in preparation for further changes
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs20
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs4
3 files changed, 17 insertions, 13 deletions
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
184 // persistence thread visits this object. In the future, changes can be signalled at a more 184 // persistence thread visits this object. In the future, changes can be signalled at a more
185 // granular level, or we could let the datastore worry about whether prims have really 185 // granular level, or we could let the datastore worry about whether prims have really
186 // changed since they were last persisted. 186 // changed since they were last persisted.
187 HasChanged = true; 187 HasPrimChanged = true;
188 188
189 return true; 189 return true;
190 } 190 }
@@ -241,7 +241,7 @@ namespace OpenSim.Region.Environment.Scenes
241 // persistence thread visits this object. In the future, changes can be signalled at a more 241 // persistence thread visits this object. In the future, changes can be signalled at a more
242 // granular level, or we could let the datastore worry about whether prims have really 242 // granular level, or we could let the datastore worry about whether prims have really
243 // changed since they were last persisted. 243 // changed since they were last persisted.
244 HasChanged = true; 244 HasPrimChanged = true;
245 245
246 return true; 246 return true;
247 } 247 }
@@ -268,7 +268,7 @@ namespace OpenSim.Region.Environment.Scenes
268 // persistence thread visits this object. In the future, changes can be signalled at a more 268 // persistence thread visits this object. In the future, changes can be signalled at a more
269 // granular level, or we could let the datastore worry about whether prims have really 269 // granular level, or we could let the datastore worry about whether prims have really
270 // changed since they were last persisted. 270 // changed since they were last persisted.
271 HasChanged = true; 271 HasPrimChanged = true;
272 272
273 return type; 273 return type;
274 } 274 }
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
55 55
56 public event PrimCountTaintedDelegate OnPrimCountTainted; 56 public event PrimCountTaintedDelegate OnPrimCountTainted;
57 57
58 public bool HasChanged = false; 58 /// <summary>
59 /// Signal whether the prim's non-inventory attributes have changed
60 /// since its last persistent backup
61 /// </summary>
62 public bool HasPrimChanged = false;
59 63
60 private LLVector3 lastPhysGroupPos; 64 private LLVector3 lastPhysGroupPos;
61 private LLQuaternion lastPhysGroupRot; 65 private LLQuaternion lastPhysGroupRot;
@@ -728,7 +732,7 @@ namespace OpenSim.Region.Environment.Scenes
728 /// </summary> 732 /// </summary>
729 public void ScheduleGroupForFullUpdate() 733 public void ScheduleGroupForFullUpdate()
730 { 734 {
731 HasChanged = true; 735 HasPrimChanged = true;
732 foreach (SceneObjectPart part in m_parts.Values) 736 foreach (SceneObjectPart part in m_parts.Values)
733 { 737 {
734 part.ScheduleFullUpdate(); 738 part.ScheduleFullUpdate();
@@ -740,7 +744,7 @@ namespace OpenSim.Region.Environment.Scenes
740 /// </summary> 744 /// </summary>
741 public void ScheduleGroupForTerseUpdate() 745 public void ScheduleGroupForTerseUpdate()
742 { 746 {
743 HasChanged = true; 747 HasPrimChanged = true;
744 foreach (SceneObjectPart part in m_parts.Values) 748 foreach (SceneObjectPart part in m_parts.Values)
745 { 749 {
746 part.ScheduleTerseUpdate(); 750 part.ScheduleTerseUpdate();
@@ -752,7 +756,7 @@ namespace OpenSim.Region.Environment.Scenes
752 /// </summary> 756 /// </summary>
753 public void SendGroupFullUpdate() 757 public void SendGroupFullUpdate()
754 { 758 {
755 HasChanged = true; 759 HasPrimChanged = true;
756 foreach (SceneObjectPart part in m_parts.Values) 760 foreach (SceneObjectPart part in m_parts.Values)
757 { 761 {
758 part.SendFullUpdateToAllClients(); 762 part.SendFullUpdateToAllClients();
@@ -764,7 +768,7 @@ namespace OpenSim.Region.Environment.Scenes
764 /// </summary> 768 /// </summary>
765 public void SendGroupTerseUpdate() 769 public void SendGroupTerseUpdate()
766 { 770 {
767 HasChanged = true; 771 HasPrimChanged = true;
768 foreach (SceneObjectPart part in m_parts.Values) 772 foreach (SceneObjectPart part in m_parts.Values)
769 { 773 {
770 part.SendTerseUpdateToAllClients(); 774 part.SendTerseUpdateToAllClients();
@@ -1483,10 +1487,10 @@ namespace OpenSim.Region.Environment.Scenes
1483 /// <param name="datastore"></param> 1487 /// <param name="datastore"></param>
1484 public void ProcessBackup(IRegionDataStore datastore) 1488 public void ProcessBackup(IRegionDataStore datastore)
1485 { 1489 {
1486 if (HasChanged) 1490 if (HasPrimChanged)
1487 { 1491 {
1488 datastore.StoreObject(this, m_scene.RegionInfo.RegionID); 1492 datastore.StoreObject(this, m_scene.RegionInfo.RegionID);
1489 HasChanged = false; 1493 HasPrimChanged = false;
1490 } 1494 }
1491 } 1495 }
1492 1496
@@ -1598,7 +1602,7 @@ namespace OpenSim.Region.Environment.Scenes
1598 public void ResetChildPrimPhysicsPositions() 1602 public void ResetChildPrimPhysicsPositions()
1599 { 1603 {
1600 AbsolutePosition = AbsolutePosition; 1604 AbsolutePosition = AbsolutePosition;
1601 HasChanged = false; 1605 HasPrimChanged = false;
1602 } 1606 }
1603 1607
1604 public LLUUID GetPartsFullID(uint localID) 1608 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
1089 { 1089 {
1090 if (m_parentGroup != null) 1090 if (m_parentGroup != null)
1091 { 1091 {
1092 m_parentGroup.HasChanged = true; 1092 m_parentGroup.HasPrimChanged = true;
1093 } 1093 }
1094 TimeStampFull = (uint) Util.UnixTimeSinceEpoch(); 1094 TimeStampFull = (uint) Util.UnixTimeSinceEpoch();
1095 m_updateFlag = 2; 1095 m_updateFlag = 2;
@@ -1130,7 +1130,7 @@ namespace OpenSim.Region.Environment.Scenes
1130 { 1130 {
1131 if (m_parentGroup != null) 1131 if (m_parentGroup != null)
1132 { 1132 {
1133 m_parentGroup.HasChanged = true; 1133 m_parentGroup.HasPrimChanged = true;
1134 } 1134 }
1135 TimeStampTerse = (uint) Util.UnixTimeSinceEpoch(); 1135 TimeStampTerse = (uint) Util.UnixTimeSinceEpoch();
1136 m_updateFlag = 1; 1136 m_updateFlag = 1;