diff options
| author | Diva Canto | 2014-05-07 17:00:12 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-05-07 17:00:12 -0700 |
| commit | f4cba27105f68914de455cf6a27b9126e086cea1 (patch) | |
| tree | d87599f942f1e839dc4262f18c946564528314be /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Allow Tools.Configger to take -inifile as argument (diff) | |
| parent | Add GridUserService service config to [UserAccountService] in Robust[.HG].ini... (diff) | |
| download | opensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.zip opensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.tar.gz opensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.tar.bz2 opensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 0356599..3b1c5d8 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1421,7 +1421,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1421 | 1421 | ||
| 1422 | Scene.ForEachScenePresence(sp => | 1422 | Scene.ForEachScenePresence(sp => |
| 1423 | { | 1423 | { |
| 1424 | if (!sp.IsChildAgent && sp.ParentID == LocalId) | 1424 | if (!sp.IsChildAgent && sp.ParentID == part.LocalId) |
| 1425 | sp.StandUp(); | 1425 | sp.StandUp(); |
| 1426 | 1426 | ||
| 1427 | if (!silent) | 1427 | if (!silent) |