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

* As yet incomplete fix for mantis #766 - terse updates broken 

* Currently, terse updates are back, and extremely rapid linking and delinking will only break occasionally
* More work to do here
0.6.0-stable
Justin Clarke Casey 2008-03-14 16:28:33 +00:00
parent ce9c2ecac8
commit dc84f350a7
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -947,6 +947,9 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="objectGroup">The group of prims which should be linked to this group</param> /// <param name="objectGroup">The group of prims which should be linked to this group</param>
public void LinkToGroup(SceneObjectGroup objectGroup) public void LinkToGroup(SceneObjectGroup objectGroup)
{ {
if (objectGroup.RootPart.UpdateFlag > 0)
return;
SceneObjectPart linkPart = objectGroup.m_rootPart; SceneObjectPart linkPart = objectGroup.m_rootPart;
Vector3 oldGroupPosition = Vector3 oldGroupPosition =
@ -1014,6 +1017,9 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="partID"></param> /// <param name="partID"></param>
public void DelinkFromGroup(uint partID) public void DelinkFromGroup(uint partID)
{ {
if (RootPart.UpdateFlag > 0)
return;
SceneObjectPart linkPart = GetChildPart(partID); SceneObjectPart linkPart = GetChildPart(partID);
if (null != linkPart) if (null != linkPart)

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

@ -1114,7 +1114,17 @@ namespace OpenSim.Region.Environment.Scenes
m_parentGroup.QueueForUpdateCheck(); m_parentGroup.QueueForUpdateCheck();
} }
TimeStampFull = (uint) Util.UnixTimeSinceEpoch(); int timeNow = Util.UnixTimeSinceEpoch();
if (timeNow == TimeStampFull)
{
TimeStampFull += 1;
}
else
{
TimeStampFull = (uint)timeNow;
}
m_updateFlag = 2; m_updateFlag = 2;
} }

10
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -479,8 +479,12 @@ namespace OpenSim.Region.Environment.Scenes
// //
// If we don't do this, various events (such as linking and delinking in the same // If we don't do this, various events (such as linking and delinking in the same
// second), will stop working properly! // second), will stop working properly!
if (update.LastFullUpdateTime <= part.TimeStampFull) if (update.LastFullUpdateTime < part.TimeStampFull)
{ {
// m_log.DebugFormat(
// "[SCENE PRESENCE]: Fully updating prim {0}, {1} - part timestamp {2}",
// part.Name, part.UUID, part.TimeStampFull);
//need to do a full update //need to do a full update
part.SendFullUpdate(ControllingClient, GenerateClientFlags(part.UUID)); part.SendFullUpdate(ControllingClient, GenerateClientFlags(part.UUID));
@ -494,6 +498,10 @@ namespace OpenSim.Region.Environment.Scenes
} }
else if (update.LastTerseUpdateTime <= part.TimeStampTerse) else if (update.LastTerseUpdateTime <= part.TimeStampTerse)
{ {
// m_log.DebugFormat(
// "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}",
// part.Name, part.UUID, part.TimeStampTerse);
part.SendTerseUpdate(ControllingClient); part.SendTerseUpdate(ControllingClient);
update.LastTerseUpdateTime = part.TimeStampTerse; update.LastTerseUpdateTime = part.TimeStampTerse;