diff options
| author | Justin Clark-Casey (justincc) | 2013-01-19 02:29:02 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-19 02:29:02 +0000 |
| commit | fc6115f77755734d5a60b9eeebef25b98696f4e4 (patch) | |
| tree | 30258506ad8a34a5e69e90ce78939adec5c73a20 | |
| parent | Assign the SmartThreadPool name in the constructor (diff) | |
| download | opensim-SC-fc6115f77755734d5a60b9eeebef25b98696f4e4.zip opensim-SC-fc6115f77755734d5a60b9eeebef25b98696f4e4.tar.gz opensim-SC-fc6115f77755734d5a60b9eeebef25b98696f4e4.tar.bz2 opensim-SC-fc6115f77755734d5a60b9eeebef25b98696f4e4.tar.xz | |
Check the existing ScenePresence.ParentPart to make sure we're not trying to sit on a prim we're already sat upon, rather than looking up the part from scratch.
An adaptation of commit 055b8a2
Having both ParentID and ParentPart references now is redundant. ParentID should probably be eliminated.
| -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(); |