diff options
| author | Justin Clark-Casey (justincc) | 2013-01-24 00:02:43 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-24 00:02:43 +0000 |
| commit | a1f78ceb37dda544f8d04aa00bf3fedd298f024e (patch) | |
| tree | e3f9b4f03f712dc63a4aefc5ac389f9b1c36ed8d /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | New constants for llGetObjectDetails (diff) | |
| parent | BulletSim: remove setting of vehicle InterpolationRotationalVelocity. (diff) | |
| download | opensim-SC-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.zip opensim-SC-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.tar.gz opensim-SC-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.tar.bz2 opensim-SC-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c295305..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(); |