OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change SOP.HasChanged to HasPrimChanged in preparation for further changes

ThreadPoolClientBranch
Justin Clarke Casey 2008-01-18 18:43:16 +00:00
parent dfda3dd4d7
commit be50fa76ee
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
View File

@ -184,7 +184,7 @@ namespace OpenSim.Region.Environment.Scenes
// persistence thread visits this object. In the future, changes can be signalled at a more // 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 // granular level, or we could let the datastore worry about whether prims have really
// changed since they were last persisted. // changed since they were last persisted.
HasChanged = true; HasPrimChanged = true;
return 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 // 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 // granular level, or we could let the datastore worry about whether prims have really
// changed since they were last persisted. // changed since they were last persisted.
HasChanged = true; HasPrimChanged = true;
return 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 // 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 // granular level, or we could let the datastore worry about whether prims have really
// changed since they were last persisted. // changed since they were last persisted.
HasChanged = true; HasPrimChanged = true;
return type; return type;
} }

20
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -55,7 +55,11 @@ namespace OpenSim.Region.Environment.Scenes
public event PrimCountTaintedDelegate OnPrimCountTainted; 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 LLVector3 lastPhysGroupPos;
private LLQuaternion lastPhysGroupRot; private LLQuaternion lastPhysGroupRot;
@ -728,7 +732,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public void ScheduleGroupForFullUpdate() public void ScheduleGroupForFullUpdate()
{ {
HasChanged = true; HasPrimChanged = true;
foreach (SceneObjectPart part in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)
{ {
part.ScheduleFullUpdate(); part.ScheduleFullUpdate();
@ -740,7 +744,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public void ScheduleGroupForTerseUpdate() public void ScheduleGroupForTerseUpdate()
{ {
HasChanged = true; HasPrimChanged = true;
foreach (SceneObjectPart part in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)
{ {
part.ScheduleTerseUpdate(); part.ScheduleTerseUpdate();
@ -752,7 +756,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public void SendGroupFullUpdate() public void SendGroupFullUpdate()
{ {
HasChanged = true; HasPrimChanged = true;
foreach (SceneObjectPart part in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)
{ {
part.SendFullUpdateToAllClients(); part.SendFullUpdateToAllClients();
@ -764,7 +768,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public void SendGroupTerseUpdate() public void SendGroupTerseUpdate()
{ {
HasChanged = true; HasPrimChanged = true;
foreach (SceneObjectPart part in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)
{ {
part.SendTerseUpdateToAllClients(); part.SendTerseUpdateToAllClients();
@ -1483,10 +1487,10 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="datastore"></param> /// <param name="datastore"></param>
public void ProcessBackup(IRegionDataStore datastore) public void ProcessBackup(IRegionDataStore datastore)
{ {
if (HasChanged) if (HasPrimChanged)
{ {
datastore.StoreObject(this, m_scene.RegionInfo.RegionID); datastore.StoreObject(this, m_scene.RegionInfo.RegionID);
HasChanged = false; HasPrimChanged = false;
} }
} }
@ -1598,7 +1602,7 @@ namespace OpenSim.Region.Environment.Scenes
public void ResetChildPrimPhysicsPositions() public void ResetChildPrimPhysicsPositions()
{ {
AbsolutePosition = AbsolutePosition; AbsolutePosition = AbsolutePosition;
HasChanged = false; HasPrimChanged = false;
} }
public LLUUID GetPartsFullID(uint localID) public LLUUID GetPartsFullID(uint localID)

4
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -1089,7 +1089,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (m_parentGroup != null) if (m_parentGroup != null)
{ {
m_parentGroup.HasChanged = true; m_parentGroup.HasPrimChanged = true;
} }
TimeStampFull = (uint) Util.UnixTimeSinceEpoch(); TimeStampFull = (uint) Util.UnixTimeSinceEpoch();
m_updateFlag = 2; m_updateFlag = 2;
@ -1130,7 +1130,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
if (m_parentGroup != null) if (m_parentGroup != null)
{ {
m_parentGroup.HasChanged = true; m_parentGroup.HasPrimChanged = true;
} }
TimeStampTerse = (uint) Util.UnixTimeSinceEpoch(); TimeStampTerse = (uint) Util.UnixTimeSinceEpoch();
m_updateFlag = 1; m_updateFlag = 1;