From 7f195de3032e909771a3c066d194f073ee0876d6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 3 Jan 2013 20:57:14 +0000
Subject: Fix problem where object attached from ground often does not get
 attached properly.

It seems this is happening because we send a kill for objects that are selected when attached.
A code comment says that this is to get the client to deselect it, but v3 and v1 clients do this just fine without the kill.
Aims to address http://opensimulator.org/mantis/view.php?id=6456
---
 .../Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Attachments')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 24170fc..da59472 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -654,15 +654,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             if (!silent)
             {
-                // Killing it here will cause the client to deselect it
-                // It then reappears on the avatar, deselected
-                // through the full update below
-                //
-                if (so.IsSelected)
-                {
-                    m_scene.SendKillObject(new List<uint> { so.RootPart.LocalId });
-                }
-                else if (so.HasPrivateAttachmentPoint)
+                if (so.HasPrivateAttachmentPoint)
                 {
 //                    m_log.DebugFormat(
 //                        "[ATTACHMENTS MODULE]: Killing private HUD {0} for avatars other than {1} at attachment point {2}",
-- 
cgit v1.1


From a75f24bb7967e45618f03691e6b9837ef6bcdf27 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 3 Jan 2013 21:06:50 +0000
Subject: minor: Add some doc to the extremely unhelpful 'fudge....' comment as
 to why we're deselecting the prim in code before scheduling an update on
 attachment

---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Attachments')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index da59472..58ed554 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -669,7 +669,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                             });
                 }
 
-                so.IsSelected = false; // fudge....
+                // Fudge below is an extremely unhelpful comment.  It's probably here so that the scheduled full update
+                // will succeed, as that will not update if an attachment is selected.
+                so.IsSelected = false; // fudge.... 
+
                 so.ScheduleGroupForFullUpdate();
             }
 
-- 
cgit v1.1