aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-16 00:18:59 +0000
committerJustin Clark-Casey (justincc)2013-01-16 00:20:18 +0000
commit03a8a4426fddd05418309958cbbc2966cdad75e5 (patch)
tree2cabd553d5fb898fcfd52c396ab6dd850d504c96 /OpenSim/Region/Framework/Scenes
parentImplement co-operative script termination if termination comes during a scrip... (diff)
parentMerge branch 'master' of /home/opensim/var/repo/opensim (diff)
downloadopensim-SC_OLD-03a8a4426fddd05418309958cbbc2966cdad75e5.zip
opensim-SC_OLD-03a8a4426fddd05418309958cbbc2966cdad75e5.tar.gz
opensim-SC_OLD-03a8a4426fddd05418309958cbbc2966cdad75e5.tar.bz2
opensim-SC_OLD-03a8a4426fddd05418309958cbbc2966cdad75e5.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0219540..6979c33 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1954,6 +1954,10 @@ namespace OpenSim.Region.Framework.Scenes
1954 { 1954 {
1955 if (ParentID != 0) 1955 if (ParentID != 0)
1956 { 1956 {
1957 var targetPart = m_scene.GetSceneObjectPart(targetID);
1958 if (targetPart != null && targetPart.LocalId == ParentID)
1959 return; // already sitting here, ignore
1960
1957 StandUp(); 1961 StandUp();
1958 } 1962 }
1959 1963