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/ScenePresence.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 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c824e56..a8c98ed 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1846,7 +1846,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1846 | //look for prims with explicit sit targets that are available | 1846 | //look for prims with explicit sit targets that are available |
1847 | foreach (SceneObjectPart part in partArray) | 1847 | foreach (SceneObjectPart part in partArray) |
1848 | { | 1848 | { |
1849 | if (part.IsSitTargetSet && !part.IsSitTargetOccupied) | 1849 | if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero) |
1850 | { | 1850 | { |
1851 | //switch the target to this prim | 1851 | //switch the target to this prim |
1852 | return part; | 1852 | return part; |
@@ -1878,7 +1878,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1878 | 1878 | ||
1879 | if (part.IsSitTargetSet) | 1879 | if (part.IsSitTargetSet) |
1880 | { | 1880 | { |
1881 | if (!part.IsSitTargetOccupied) | 1881 | if (part.SitTargetAvatar == UUID.Zero) |
1882 | { | 1882 | { |
1883 | // m_log.DebugFormat( | 1883 | // m_log.DebugFormat( |
1884 | // "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is set and unoccupied", | 1884 | // "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is set and unoccupied", |