diff options
author | Justin Clark-Casey (justincc) | 2012-07-10 23:39:05 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-10 23:39:05 +0100 |
commit | 11e0ad6dc8663756154652465750c1ebaaf3124f (patch) | |
tree | 16dd46e38f172ca7092c897953cc8cc1a3a81c48 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | refactor: Add SOP.IsSitTargetOccupied to improve readability (diff) | |
download | opensim-SC_OLD-11e0ad6dc8663756154652465750c1ebaaf3124f.zip opensim-SC_OLD-11e0ad6dc8663756154652465750c1ebaaf3124f.tar.gz opensim-SC_OLD-11e0ad6dc8663756154652465750c1ebaaf3124f.tar.bz2 opensim-SC_OLD-11e0ad6dc8663756154652465750c1ebaaf3124f.tar.xz |
Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"
This reverts commit c8f0d476d2f775ba4d7afca12eeff527b46bb8e2.
On reconsideration, I think this is less readable since immediately following code still sets SitTargetAvatar directly
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 937f43e..dcec7e9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -136,11 +136,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
136 | } | 136 | } |
137 | 137 | ||
138 | /// <summary> | 138 | /// <summary> |
139 | /// Is the sit target of this part occupied? | ||
140 | /// </summary> | ||
141 | public bool IsSitTargetOccupied { get { return SitTargetAvatar != UUID.Zero; } } | ||
142 | |||
143 | /// <summary> | ||
144 | /// Is an explicit sit target set for this part? | 139 | /// Is an explicit sit target set for this part? |
145 | /// </summary> | 140 | /// </summary> |
146 | public bool IsSitTargetSet | 141 | public bool IsSitTargetSet |
@@ -741,7 +736,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
741 | } | 736 | } |
742 | 737 | ||
743 | // TODO if we decide to do sitting in a more SL compatible way (multiple avatars per prim), this has to be fixed, too | 738 | // TODO if we decide to do sitting in a more SL compatible way (multiple avatars per prim), this has to be fixed, too |
744 | if (IsSitTargetOccupied) | 739 | if (SitTargetAvatar != UUID.Zero) |
745 | { | 740 | { |
746 | ScenePresence avatar; | 741 | ScenePresence avatar; |
747 | if (ParentGroup.Scene.TryGetScenePresence(SitTargetAvatar, out avatar)) | 742 | if (ParentGroup.Scene.TryGetScenePresence(SitTargetAvatar, out avatar)) |