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

* Another attempt to remedy the 'ghost prim' situation. This time for attachments on teleport.

trunk
Teravus Ovares 2009-07-17 18:38:03 +00:00
parent ebb03e2aab
commit 05c24a648d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1705,6 +1705,8 @@ namespace OpenSim.Region.Framework.Scenes
{ {
m_log.DebugFormat("[INTERREGION]: A new prim {0} arrived from a neighbor", primID); m_log.DebugFormat("[INTERREGION]: A new prim {0} arrived from a neighbor", primID);
SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData); SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData);
if (sceneObject.IsAttachment)
sceneObject.RootPart.ObjectFlags |= (uint)PrimFlags.Phantom;
return AddSceneObject(sceneObject); return AddSceneObject(sceneObject);
} }
@ -1842,6 +1844,7 @@ namespace OpenSim.Region.Framework.Scenes
if (sceneObject.RootPart.Shape.State != 0) // Attachment if (sceneObject.RootPart.Shape.State != 0) // Attachment
{ {
sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez); sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
AddRestoredSceneObject(sceneObject, false, false); AddRestoredSceneObject(sceneObject, false, false);