aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2016-06-12 14:29:30 -0700
committerDiva Canto2016-06-12 14:29:30 -0700
commitd0c65d15dc02809420f44dfbda828e333754343d (patch)
tree3aae05e66e99c09544bcfea76f6e2b9f4507ccc4 /OpenSim/Region
parentDetection of Cylinder and Prism for flexi prims (diff)
downloadopensim-SC_OLD-d0c65d15dc02809420f44dfbda828e333754343d.zip
opensim-SC_OLD-d0c65d15dc02809420f44dfbda828e333754343d.tar.gz
opensim-SC_OLD-d0c65d15dc02809420f44dfbda828e333754343d.tar.bz2
opensim-SC_OLD-d0c65d15dc02809420f44dfbda828e333754343d.tar.xz
Still mantis #7858: send kill object / update to child agents too
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 09dc663..0385582 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1998,9 +1998,9 @@ namespace OpenSim.Region.Framework.Scenes
1998 1998
1999 if (Scene != null) 1999 if (Scene != null)
2000 { 2000 {
2001 Scene.ForEachRootScenePresence(delegate(ScenePresence avatar) 2001 Scene.ForEachScenePresence(delegate(ScenePresence avatar)
2002 { 2002 {
2003 if (avatar.ParentID == LocalId) 2003 if (!avatar.IsChildAgent && avatar.ParentID == LocalId)
2004 avatar.StandUp(); 2004 avatar.StandUp();
2005 2005
2006 if (!silent) 2006 if (!silent)