diff options
| author | Melanie | 2013-01-16 16:52:57 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 16:52:57 +0000 |
| commit | 9c99ed26ebe7cd2e42c10487e4ddfde0c934d921 (patch) | |
| tree | 536b2d6530fdda925203afddd27a4b9444e4d2a7 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Complete removal of the now unused state queue (diff) | |
| parent | Changed a couple of debug messages at the request of osgrid. (diff) | |
| download | opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.zip opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.gz opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.bz2 opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -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 0219540..6979c33 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1954,6 +1954,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1954 | { | 1954 | { |
| 1955 | if (ParentID != 0) | 1955 | if (ParentID != 0) |
| 1956 | { | 1956 | { |
| 1957 | var targetPart = m_scene.GetSceneObjectPart(targetID); | ||
| 1958 | if (targetPart != null && targetPart.LocalId == ParentID) | ||
| 1959 | return; // already sitting here, ignore | ||
| 1960 | |||
| 1957 | StandUp(); | 1961 | StandUp(); |
| 1958 | } | 1962 | } |
| 1959 | 1963 | ||