diff options
author | Teravus Ovares | 2009-07-17 18:38:03 +0000 |
---|---|---|
committer | Teravus Ovares | 2009-07-17 18:38:03 +0000 |
commit | 05c24a648d6f860dc412e424e724392798070f2b (patch) | |
tree | 852236855f6bd11e8ae0f2f579d1b7da9dbaf666 /OpenSim/Region/Framework | |
parent | * This should fix the phantom prim from attachments rezzing. (diff) | |
download | opensim-SC_OLD-05c24a648d6f860dc412e424e724392798070f2b.zip opensim-SC_OLD-05c24a648d6f860dc412e424e724392798070f2b.tar.gz opensim-SC_OLD-05c24a648d6f860dc412e424e724392798070f2b.tar.bz2 opensim-SC_OLD-05c24a648d6f860dc412e424e724392798070f2b.tar.xz |
* Another attempt to remedy the 'ghost prim' situation. This time for attachments on teleport.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 63cf9ce..c39cb2d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1705,6 +1705,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1705 | { | 1705 | { |
1706 | m_log.DebugFormat("[INTERREGION]: A new prim {0} arrived from a neighbor", primID); | 1706 | m_log.DebugFormat("[INTERREGION]: A new prim {0} arrived from a neighbor", primID); |
1707 | SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData); | 1707 | SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData); |
1708 | if (sceneObject.IsAttachment) | ||
1709 | sceneObject.RootPart.ObjectFlags |= (uint)PrimFlags.Phantom; | ||
1708 | 1710 | ||
1709 | return AddSceneObject(sceneObject); | 1711 | return AddSceneObject(sceneObject); |
1710 | } | 1712 | } |
@@ -1842,6 +1844,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1842 | if (sceneObject.RootPart.Shape.State != 0) // Attachment | 1844 | if (sceneObject.RootPart.Shape.State != 0) // Attachment |
1843 | { | 1845 | { |
1844 | sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez); | 1846 | sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez); |
1847 | sceneObject.RootPart.AddFlag(PrimFlags.Phantom); | ||
1845 | 1848 | ||
1846 | AddRestoredSceneObject(sceneObject, false, false); | 1849 | AddRestoredSceneObject(sceneObject, false, false); |
1847 | 1850 | ||