aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-03 20:57:14 +0000
committerJustin Clark-Casey (justincc)2013-01-04 21:49:48 +0000
commitb00935015a9a2630b402eca2158186343ce3a98b (patch)
treee766e254e992ff9ebf81d806b64fb0cb669e87e8
parentImproving documentation of AttachToAvatar and GetLine methods in LSL_Api.cs b... (diff)
downloadopensim-SC_OLD-b00935015a9a2630b402eca2158186343ce3a98b.zip
opensim-SC_OLD-b00935015a9a2630b402eca2158186343ce3a98b.tar.gz
opensim-SC_OLD-b00935015a9a2630b402eca2158186343ce3a98b.tar.bz2
opensim-SC_OLD-b00935015a9a2630b402eca2158186343ce3a98b.tar.xz
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
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs10
1 files changed, 1 insertions, 9 deletions
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
654 654
655 if (!silent) 655 if (!silent)
656 { 656 {
657 // Killing it here will cause the client to deselect it 657 if (so.HasPrivateAttachmentPoint)
658 // It then reappears on the avatar, deselected
659 // through the full update below
660 //
661 if (so.IsSelected)
662 {
663 m_scene.SendKillObject(new List<uint> { so.RootPart.LocalId });
664 }
665 else if (so.HasPrivateAttachmentPoint)
666 { 658 {
667// m_log.DebugFormat( 659// m_log.DebugFormat(
668// "[ATTACHMENTS MODULE]: Killing private HUD {0} for avatars other than {1} at attachment point {2}", 660// "[ATTACHMENTS MODULE]: Killing private HUD {0} for avatars other than {1} at attachment point {2}",