aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-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, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 8320c79..59ffded 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 HasPrimChanged = true; 187 HasGroupChanged = 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 HasPrimChanged = true; 244 HasGroupChanged = 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 HasPrimChanged = true; 271 HasGroupChanged = 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 77841eb..be24f66 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -56,10 +56,10 @@ namespace OpenSim.Region.Environment.Scenes
56 public event PrimCountTaintedDelegate OnPrimCountTainted; 56 public event PrimCountTaintedDelegate OnPrimCountTainted;
57 57
58 /// <summary> 58 /// <summary>
59 /// Signal whether the prim's non-inventory attributes have changed 59 /// Signal whether the non-inventory attributes of any prims in the group have changed
60 /// since its last persistent backup 60 /// since the group's last persistent backup
61 /// </summary> 61 /// </summary>
62 public bool HasPrimChanged = false; 62 public bool HasGroupChanged = false;
63 63
64 private LLVector3 lastPhysGroupPos; 64 private LLVector3 lastPhysGroupPos;
65 private LLQuaternion lastPhysGroupRot; 65 private LLQuaternion lastPhysGroupRot;
@@ -732,7 +732,7 @@ namespace OpenSim.Region.Environment.Scenes
732 /// </summary> 732 /// </summary>
733 public void ScheduleGroupForFullUpdate() 733 public void ScheduleGroupForFullUpdate()
734 { 734 {
735 HasPrimChanged = true; 735 HasGroupChanged = true;
736 foreach (SceneObjectPart part in m_parts.Values) 736 foreach (SceneObjectPart part in m_parts.Values)
737 { 737 {
738 part.ScheduleFullUpdate(); 738 part.ScheduleFullUpdate();
@@ -744,7 +744,7 @@ namespace OpenSim.Region.Environment.Scenes
744 /// </summary> 744 /// </summary>
745 public void ScheduleGroupForTerseUpdate() 745 public void ScheduleGroupForTerseUpdate()
746 { 746 {
747 HasPrimChanged = true; 747 HasGroupChanged = true;
748 foreach (SceneObjectPart part in m_parts.Values) 748 foreach (SceneObjectPart part in m_parts.Values)
749 { 749 {
750 part.ScheduleTerseUpdate(); 750 part.ScheduleTerseUpdate();
@@ -756,7 +756,7 @@ namespace OpenSim.Region.Environment.Scenes
756 /// </summary> 756 /// </summary>
757 public void SendGroupFullUpdate() 757 public void SendGroupFullUpdate()
758 { 758 {
759 HasPrimChanged = true; 759 HasGroupChanged = true;
760 foreach (SceneObjectPart part in m_parts.Values) 760 foreach (SceneObjectPart part in m_parts.Values)
761 { 761 {
762 part.SendFullUpdateToAllClients(); 762 part.SendFullUpdateToAllClients();
@@ -768,7 +768,7 @@ namespace OpenSim.Region.Environment.Scenes
768 /// </summary> 768 /// </summary>
769 public void SendGroupTerseUpdate() 769 public void SendGroupTerseUpdate()
770 { 770 {
771 HasPrimChanged = true; 771 HasGroupChanged = true;
772 foreach (SceneObjectPart part in m_parts.Values) 772 foreach (SceneObjectPart part in m_parts.Values)
773 { 773 {
774 part.SendTerseUpdateToAllClients(); 774 part.SendTerseUpdateToAllClients();
@@ -1487,10 +1487,10 @@ namespace OpenSim.Region.Environment.Scenes
1487 /// <param name="datastore"></param> 1487 /// <param name="datastore"></param>
1488 public void ProcessBackup(IRegionDataStore datastore) 1488 public void ProcessBackup(IRegionDataStore datastore)
1489 { 1489 {
1490 if (HasPrimChanged) 1490 if (HasGroupChanged)
1491 { 1491 {
1492 datastore.StoreObject(this, m_scene.RegionInfo.RegionID); 1492 datastore.StoreObject(this, m_scene.RegionInfo.RegionID);
1493 HasPrimChanged = false; 1493 HasGroupChanged = false;
1494 } 1494 }
1495 } 1495 }
1496 1496
@@ -1602,7 +1602,7 @@ namespace OpenSim.Region.Environment.Scenes
1602 public void ResetChildPrimPhysicsPositions() 1602 public void ResetChildPrimPhysicsPositions()
1603 { 1603 {
1604 AbsolutePosition = AbsolutePosition; 1604 AbsolutePosition = AbsolutePosition;
1605 HasPrimChanged = false; 1605 HasGroupChanged = false;
1606 } 1606 }
1607 1607
1608 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 930801c..7bd55e5 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.HasPrimChanged = true; 1092 m_parentGroup.HasGroupChanged = 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.HasPrimChanged = true; 1133 m_parentGroup.HasGroupChanged = true;
1134 } 1134 }
1135 TimeStampTerse = (uint) Util.UnixTimeSinceEpoch(); 1135 TimeStampTerse = (uint) Util.UnixTimeSinceEpoch();
1136 m_updateFlag = 1; 1136 m_updateFlag = 1;