diff options
| author | Diva Canto | 2016-06-12 14:29:30 -0700 |
|---|---|---|
| committer | Diva Canto | 2016-06-12 14:29:30 -0700 |
| commit | d0c65d15dc02809420f44dfbda828e333754343d (patch) | |
| tree | 3aae05e66e99c09544bcfea76f6e2b9f4507ccc4 /OpenSim/Region/Framework/Scenes | |
| parent | Detection of Cylinder and Prism for flexi prims (diff) | |
| download | opensim-SC-d0c65d15dc02809420f44dfbda828e333754343d.zip opensim-SC-d0c65d15dc02809420f44dfbda828e333754343d.tar.gz opensim-SC-d0c65d15dc02809420f44dfbda828e333754343d.tar.bz2 opensim-SC-d0c65d15dc02809420f44dfbda828e333754343d.tar.xz | |
Still mantis #7858: send kill object / update to child agents too
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 |
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) |