aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-19 02:29:02 +0000
committerJustin Clark-Casey (justincc)2013-01-25 23:53:16 +0000
commit0ba01ce6994f25c626b9e32cb2caf8e0ef34fcd5 (patch)
treed58f8ef2df48b15cdff697422564601806141219 /OpenSim/Region
parentNew constants for llGetObjectDetails (diff)
downloadopensim-SC-0ba01ce6994f25c626b9e32cb2caf8e0ef34fcd5.zip
opensim-SC-0ba01ce6994f25c626b9e32cb2caf8e0ef34fcd5.tar.gz
opensim-SC-0ba01ce6994f25c626b9e32cb2caf8e0ef34fcd5.tar.bz2
opensim-SC-0ba01ce6994f25c626b9e32cb2caf8e0ef34fcd5.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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6979c33..db2e95e 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();