diff options
| author | Melanie | 2013-01-23 02:38:59 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-23 02:38:59 +0000 |
| commit | cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad (patch) | |
| tree | 0854a68c0329c37b9eedea56b3bf65458c59b696 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: Tweeks to vehicle motion. (diff) | |
| download | opensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.zip opensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.gz opensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.bz2 opensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
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 9d18352..f024f52 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2197,8 +2197,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2197 | 2197 | ||
| 2198 | if (ParentID != 0) | 2198 | if (ParentID != 0) |
| 2199 | { | 2199 | { |
| 2200 | var targetPart = m_scene.GetSceneObjectPart(targetID); | 2200 | if (ParentPart.UUID == targetID) |
| 2201 | if (targetPart != null && targetPart.LocalId == ParentID) | ||
| 2202 | return; // already sitting here, ignore | 2201 | return; // already sitting here, ignore |
| 2203 | 2202 | ||
| 2204 | StandUp(); | 2203 | StandUp(); |