diff options
author | Melanie Thielker | 2010-09-08 00:49:32 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-09-08 00:49:32 +0200 |
commit | 7a1b1dd419d458cbf46ecdf48872497186e67355 (patch) | |
tree | 54418f0b43f45793690b3d319319b11d7be76adb /OpenSim/Region/Framework/Scenes | |
parent | Fix some issues with unlinking (diff) | |
download | opensim-SC_OLD-7a1b1dd419d458cbf46ecdf48872497186e67355.zip opensim-SC_OLD-7a1b1dd419d458cbf46ecdf48872497186e67355.tar.gz opensim-SC_OLD-7a1b1dd419d458cbf46ecdf48872497186e67355.tar.bz2 opensim-SC_OLD-7a1b1dd419d458cbf46ecdf48872497186e67355.tar.xz |
Make AddRestoredSceneObject reset the IsDeleted flag so we can take an
object out of the scene and then put it back in.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6b71426..be342ab 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2003,7 +2003,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2003 | public bool AddRestoredSceneObject( | 2003 | public bool AddRestoredSceneObject( |
2004 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) | 2004 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) |
2005 | { | 2005 | { |
2006 | return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates); | 2006 | bool result = m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates); |
2007 | if (result) | ||
2008 | sceneObject.IsDeleted = false; | ||
2009 | return result; | ||
2007 | } | 2010 | } |
2008 | 2011 | ||
2009 | /// <summary> | 2012 | /// <summary> |