aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a8c98ed..c824e56 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.SitTargetAvatar == UUID.Zero) 1849 if (part.IsSitTargetSet && !part.IsSitTargetOccupied)
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.SitTargetAvatar == UUID.Zero) 1881 if (!part.IsSitTargetOccupied)
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",