diff options
| author | Melanie | 2013-01-16 01:13:14 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 01:13:14 +0000 |
| commit | 70fa41863d1f2291d439592682b8d9fa78fa0f06 (patch) | |
| tree | 623b693af0ceec2e5b0cda8d265b8139c757627b /OpenSim/Region/Framework | |
| parent | Merge commit '7978b349bd400d14b7ecd4f8274af1921f435fee' into careminster (diff) | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| download | opensim-SC_OLD-70fa41863d1f2291d439592682b8d9fa78fa0f06.zip opensim-SC_OLD-70fa41863d1f2291d439592682b8d9fa78fa0f06.tar.gz opensim-SC_OLD-70fa41863d1f2291d439592682b8d9fa78fa0f06.tar.bz2 opensim-SC_OLD-70fa41863d1f2291d439592682b8d9fa78fa0f06.tar.xz | |
Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1d6898b..c2ff110 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2197,6 +2197,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2197 | 2197 | ||
| 2198 | if (ParentID != 0) | 2198 | if (ParentID != 0) |
| 2199 | { | 2199 | { |
| 2200 | var targetPart = m_scene.GetSceneObjectPart(targetID); | ||
| 2201 | if (targetPart != null && targetPart.LocalId == ParentID) | ||
| 2202 | return; // already sitting here, ignore | ||
| 2203 | |||
| 2200 | StandUp(); | 2204 | StandUp(); |
| 2201 | } | 2205 | } |
| 2202 | 2206 | ||