From 55262c8e1c6338662e0cff6563fe500531edfe32 Mon Sep 17 00:00:00 2001
From: onefang
Date: Wed, 24 Jul 2019 18:27:05 +1000
Subject: Allow sitting on attachments, and attaching tings with people sitting
 on them.

Now we have to fix all the viewers that though it would be great to
enshrine this bug in viewer side.
---
 .../Avatar/Attachments/AttachmentsModule.cs        | 18 +++++++++---------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 4afac28..f99cf4c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -485,15 +485,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 //                    group.Name, group.LocalId, sp.Name, attachmentPt, silent);
 
 
-            if (group.GetSittingAvatarsCount() != 0)
-            {
-                if (DebugLevel > 0)
-                    m_log.WarnFormat(
-                        "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it",
-                        group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount());
-
-                return false;
-            }
+////            if (group.GetSittingAvatarsCount() != 0)
+////            {
+////                if (DebugLevel > 0)
+////                    m_log.WarnFormat(
+////                        "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it",
+////                        group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount());
+////
+////                return false;
+////            }
 
             List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
             if (attachments.Contains(group))
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ff8d2fe..6aa5047 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3419,11 +3419,11 @@ else
             SendSitResponse(targetID, offset, Quaternion.Identity);
         }
 
-        // returns  false if does not suport so older sit can be tried
+        // returns  false if does not support so older sit can be tried
         public bool PhysicsSit(SceneObjectPart part, Vector3 offset)
         {
-            if (part == null || part.ParentGroup.IsAttachment)
-                return true;
+////            if (part == null || part.ParentGroup.IsAttachment)
+////                return true;
 
             if ( m_scene.PhysicsScene == null)
                 return false;
@@ -3549,14 +3549,14 @@ else
 
             if (part != null)
             {
-                if (part.ParentGroup.IsAttachment)
-                {
-                    m_log.WarnFormat(
-                        "[SCENE PRESENCE]: Avatar {0} tried to sit on part {1} from object {2} in {3} but this is an attachment for avatar id {4}",
-                        Name, part.Name, part.ParentGroup.Name, Scene.Name, part.ParentGroup.AttachedAvatar);
-
-                    return;
-                }
+////                if (part.ParentGroup.IsAttachment)
+////                {
+////                    m_log.WarnFormat(
+////                        "[SCENE PRESENCE]: Avatar {0} tried to sit on part {1} from object {2} in {3} but this is an attachment for avatar id {4}",
+////                        Name, part.Name, part.ParentGroup.Name, Scene.Name, part.ParentGroup.AttachedAvatar);
+////
+////                    return;
+////                }
 
                 if (part.SitTargetAvatar == UUID)
                 {
-- 
cgit v1.1