diff options
| author | BlueWall | 2013-01-23 08:16:18 -0500 |
|---|---|---|
| committer | BlueWall | 2013-01-23 08:16:18 -0500 |
| commit | 2841ed05cf003fef8dc820d0327c1fcce0d76e93 (patch) | |
| tree | 2d3647e4ffad8220e5b30fbdfbf7b3a36be0597c /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Add additional return status (diff) | |
| parent | BulletSim: Tweeks to vehicle motion. (diff) | |
| download | opensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.zip opensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.tar.gz opensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.tar.bz2 opensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6979c33..a90872e 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1954,8 +1954,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1954 | { | 1954 | { |
| 1955 | if (ParentID != 0) | 1955 | if (ParentID != 0) |
| 1956 | { | 1956 | { |
| 1957 | var targetPart = m_scene.GetSceneObjectPart(targetID); | 1957 | if (ParentPart.UUID == targetID) |
| 1958 | if (targetPart != null && targetPart.LocalId == ParentID) | ||
| 1959 | return; // already sitting here, ignore | 1958 | return; // already sitting here, ignore |
| 1960 | 1959 | ||
| 1961 | StandUp(); | 1960 | StandUp(); |
| @@ -2260,7 +2259,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2260 | 2259 | ||
| 2261 | public void HandleStopAnim(IClientAPI remoteClient, UUID animID) | 2260 | public void HandleStopAnim(IClientAPI remoteClient, UUID animID) |
| 2262 | { | 2261 | { |
| 2263 | Animator.RemoveAnimation(animID); | 2262 | Animator.RemoveAnimation(animID, false); |
| 2264 | } | 2263 | } |
| 2265 | 2264 | ||
| 2266 | /// <summary> | 2265 | /// <summary> |