From 337ea019bd0fa617df00d7bee10b869e73a50075 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 10 Jul 2012 23:55:22 +0100
Subject: If a part has a sit target and an avatar is already sitting, allow
 another avatar to sit in the position given if no sit target was set.

Previous behave was that the second avatar could not sit.
This matches behaviour observed on the LL grid.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 514c314..0e7f2e5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1872,18 +1872,15 @@ namespace OpenSim.Region.Framework.Scenes
             bool canSit = false;
             Vector3 pos = part.AbsolutePosition + offset;
 
-            if (part.IsSitTargetSet)
+            if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero)
             {
-                if (part.SitTargetAvatar == UUID.Zero)
-                {
 //                    m_log.DebugFormat(
 //                        "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is set and unoccupied",
 //                        Name, part.Name, part.LocalId);
 
-                    offset = part.SitTargetPosition;
-                    sitOrientation = part.SitTargetOrientation;
-                    canSit = true;
-                }
+                offset = part.SitTargetPosition;
+                sitOrientation = part.SitTargetOrientation;
+                canSit = true;
             }
             else
             {
-- 
cgit v1.1