aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-09-11 20:22:53 +0100
committerMelanie2010-09-11 20:22:53 +0100
commitd264f0d301b679a40aa3c3ef7c3223ca1c75cb02 (patch)
tree62e685a3bcac9afc143ed5120df7311b6a99fb65 /OpenSim/Region
parentPrevent child agents from being blacklisted in the kill record. (diff)
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC-d264f0d301b679a40aa3c3ef7c3223ca1c75cb02.zip
opensim-SC-d264f0d301b679a40aa3c3ef7c3223ca1c75cb02.tar.gz
opensim-SC-d264f0d301b679a40aa3c3ef7c3223ca1c75cb02.tar.bz2
opensim-SC-d264f0d301b679a40aa3c3ef7c3223ca1c75cb02.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
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>