aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2016-08-22 00:28:54 +0100
committerUbitUmarov2016-08-22 00:28:54 +0100
commit426e8a798f14c55d761b24961acc7f0def0a9414 (patch)
tree61137b5aec93f10b5e08e4fcfc81d4658f6ee480 /OpenSim/Region/Framework
parent add a missing lock() (diff)
downloadopensim-SC_OLD-426e8a798f14c55d761b24961acc7f0def0a9414.zip
opensim-SC_OLD-426e8a798f14c55d761b24961acc7f0def0a9414.tar.gz
opensim-SC_OLD-426e8a798f14c55d761b24961acc7f0def0a9414.tar.bz2
opensim-SC_OLD-426e8a798f14c55d761b24961acc7f0def0a9414.tar.xz
(re)fix avatar standup from a child prim on object delete
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b5dc19f..e4574b4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2078,7 +2078,7 @@ namespace OpenSim.Region.Framework.Scenes
2078 2078
2079 Scene.ForEachScenePresence(delegate(ScenePresence avatar) 2079 Scene.ForEachScenePresence(delegate(ScenePresence avatar)
2080 { 2080 {
2081 if (!avatar.IsChildAgent && avatar.ParentID == LocalId && avatar.ParentUUID == UUID.Zero) 2081 if (!avatar.IsChildAgent && avatar.ParentID == part.LocalId && avatar.ParentUUID == UUID.Zero)
2082 avatar.StandUp(); 2082 avatar.StandUp();
2083 2083
2084 if (!silent) 2084 if (!silent)