ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"

Browse Source 
This reverts commit c8f0d476d2.
On reconsideration, I think this is less readable since immediately following code still sets SitTargetAvatar directly
This commit is contained in:
Justin Clark-Casey (justincc)
2012-07-10 23:39:05 +01:00
parent c8f0d476d2
commit 11e0ad6dc8
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -135,11 +135,6 @@ namespace OpenSim.Region.Framework.Scenes
get { return ParentGroup.RootPart == this; }
}
/// <summary>
/// Is the sit target of this part occupied?
/// </summary>
public bool IsSitTargetOccupied { get { return SitTargetAvatar != UUID.Zero; } }
/// <summary>
/// Is an explicit sit target set for this part?
/// </summary>
@@ -741,7 +736,7 @@ namespace OpenSim.Region.Framework.Scenes
}
// TODO if we decide to do sitting in a more SL compatible way (multiple avatars per prim), this has to be fixed, too
if (IsSitTargetOccupied)
if (SitTargetAvatar != UUID.Zero)
{
ScenePresence avatar;
if (ParentGroup.Scene.TryGetScenePresence(SitTargetAvatar, out avatar))