diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
2 files changed, 3 insertions, 8 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)) |
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", |