aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authordahlia2013-01-14 22:24:24 -0800
committerdahlia2013-01-14 22:24:24 -0800
commit055b8a2d58a17d5dbc6cdb7f22077e6268578905 (patch)
tree4696df9384d5886674e5e30ac2ac26ae82e5a544 /OpenSim/Region/Framework/Scenes
parenttest commit for new git install (diff)
downloadopensim-SC_OLD-055b8a2d58a17d5dbc6cdb7f22077e6268578905.zip
opensim-SC_OLD-055b8a2d58a17d5dbc6cdb7f22077e6268578905.tar.gz
opensim-SC_OLD-055b8a2d58a17d5dbc6cdb7f22077e6268578905.tar.bz2
opensim-SC_OLD-055b8a2d58a17d5dbc6cdb7f22077e6268578905.tar.xz
move resit fix to ScenePresence.cs and allow for requesting sit on objects other than the object currently sat on
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