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

reimplement SceneObjectGroup.UpdateObjectAllProperties to do parts updating differently, as 

an attemp to make linkset updates correct, and rename the function UpdateObjectGroupBySync.
dsg
Huaiyu (Kitty) Liu 2011-01-19 10:52:06 -08:00
parent 8256caad3f
commit b3179d34da
2 changed files with 74 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -1945,7 +1945,7 @@ namespace OpenSim.Region.Framework.Scenes
if (entity is SceneObjectGroup) if (entity is SceneObjectGroup)
{ {
SceneObjectGroup localSog = (SceneObjectGroup)entity; SceneObjectGroup localSog = (SceneObjectGroup)entity;
Scene.ObjectUpdateResult updateResult = localSog.UpdateObjectAllProperties(updatedSog); Scene.ObjectUpdateResult updateResult = localSog.UpdateObjectGroupBySync(updatedSog);
return updateResult; return updateResult;
} }
else else

96
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -3474,10 +3474,11 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
/// <param name="updatedSog"></param> /// <param name="updatedSog"></param>
/// <returns></returns> /// <returns></returns>
public Scene.ObjectUpdateResult UpdateObjectAllProperties(SceneObjectGroup updatedSog) public Scene.ObjectUpdateResult UpdateObjectGroupBySync(SceneObjectGroup updatedSog)
{ {
if (!this.GroupID.Equals(updatedSog.GroupID)) //This GroupID check should be done by the actor who initiates the object update
return Scene.ObjectUpdateResult.Error; //if (!this.GroupID.Equals(updatedSog.GroupID))
// return Scene.ObjectUpdateResult.Error;
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
//NOTE!!! //NOTE!!!
@ -3494,16 +3495,83 @@ namespace OpenSim.Region.Framework.Scenes
bool partsRemoved = false; //has any old part been removed? bool partsRemoved = false; //has any old part been removed?
bool rootPartChanged = false; //has the rootpart be changed to a different prim? bool rootPartChanged = false; //has the rootpart be changed to a different prim?
lock (m_parts) lock (m_parts.SyncRoot)
{ {
//update rootpart, if changed //update rootpart, if changed
/*
if (m_rootPart.UUID != updatedSog.RootPart.UUID) if (m_rootPart.UUID != updatedSog.RootPart.UUID)
{ {
m_rootPart = updatedSog.RootPart; m_rootPart = updatedSog.RootPart;
rootPartChanged = true; rootPartChanged = true;
} }
* */
//foreach (KeyValuePair<UUID, SceneObjectPart> pair in updatedSog.Parts) //foreach (KeyValuePair<UUID, SceneObjectPart> pair in updatedSog.Parts)
Dictionary<UUID, SceneObjectPart> remainedParts = new Dictionary<UUID, SceneObjectPart>();
Dictionary<UUID, SceneObjectPart> removedParts = new Dictionary<UUID, SceneObjectPart>();
Dictionary<UUID, SceneObjectPart> newParts = new Dictionary<UUID, SceneObjectPart>();
//Compare the parts in updatedSog and sort them into remained/removed/newParts groups
foreach (SceneObjectPart updatedPart in updatedSog.Parts)
{
UUID partUUID = updatedPart.UUID;
if (ContainsPart(partUUID))
{
SceneObjectPart localPart = GetChildPart(partUUID);
remainedParts.Add(partUUID, localPart);
}
else
{
//in case the part is in the SceneGraph already
SceneObjectPart localPart = m_scene.GetSceneObjectPart(partUUID);
if(localPart!=null)
newParts.Add(partUUID, localPart);
else
newParts.Add(partUUID, updatedPart);
}
}
foreach (SceneObjectPart localPart in this.Parts)
{
if (!remainedParts.ContainsKey(localPart.UUID))
removedParts.Add(localPart.UUID, localPart);
}
//Add in new parts
foreach (SceneObjectPart newPart in newParts.Values)
{
AddPart(newPart);
}
//remove parts that are no longer in the group -- !!!!! need to further test how to do correct book-keeping and synchornized with other actors !!!!!!!!
foreach (SceneObjectPart rmPart in removedParts.Values)
{
DelinkFromGroup(rmPart, true);
}
if (newParts.Count > 0 || removedParts.Count > 0)
{
groupUpdateResult = Scene.ObjectUpdateResult.Updated;
}
//now update properties of the parts
foreach (SceneObjectPart part in this.Parts)
{
Scene.ObjectUpdateResult partUpdateResult = Scene.ObjectUpdateResult.Unchanged;
SceneObjectPart updatedPart = updatedSog.GetChildPart(part.UUID);
partUpdateResult = part.UpdateAllProperties(updatedPart);
if (partUpdateResult != Scene.ObjectUpdateResult.Unchanged)
{
groupUpdateResult = partUpdateResult;
}
}
//Just to make sure the parts each has the right localID of the rootpart
UpdateParentIDs();
/*
//old code below
foreach (SceneObjectPart updatedPart in updatedSog.Parts) foreach (SceneObjectPart updatedPart in updatedSog.Parts)
{ {
UUID partUUID = updatedPart.UUID; UUID partUUID = updatedPart.UUID;
@ -3547,26 +3615,8 @@ namespace OpenSim.Region.Framework.Scenes
{ {
UpdateParentIDs(); UpdateParentIDs();
} }
}
if (partsRemoved)
{
groupUpdateResult = Scene.ObjectUpdateResult.Updated;
}
/*
//update the authoritative scene that this object is located, which is identified by (LocX, LocY)
if (this.m_locX != updatedSog.LocX)
{
this.m_locX = updatedSog.LocX;
groupUpdateResult = Scene.ObjectUpdateResult.Updated;
}
if (this.m_locY != updatedSog.LocY)
{
this.m_locY = updatedSog.LocY;
groupUpdateResult = Scene.ObjectUpdateResult.Updated;
}
* */ * */
}
//Schedule updates to be sent out, if the local copy has just been updated //Schedule updates to be sent out, if the local copy has just been updated
//(1) if we are debugging the actor with a viewer attaching to it, //(1) if we are debugging the actor with a viewer attaching to it,