svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index a2698763f0..8f4df36f59 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -3899,6 +3899,7 @@ void LLSelectMgr::sendAttach(U8 attachment_point)
 		return;
 	}
 
+	BOOL build_mode = gToolMgr->inEdit();
 	// Special case: Attach to default location for this object.
 	if (0 == attachment_point)
 	{
@@ -3908,6 +3909,10 @@ void LLSelectMgr::sendAttach(U8 attachment_point)
 			packObjectIDAndRotation, 
 			&attachment_point, 
 			SEND_ONLY_ROOTS );
+		if (!build_mode)
+		{
+			deselectAll();
+		}
 	}
 	else
 	{
@@ -3945,6 +3950,10 @@ void LLSelectMgr::sendAttach(U8 attachment_point)
 				packObjectIDAndRotation,
 				&attachment_point,
 				SEND_ONLY_ROOTS );
+			if (!build_mode)
+			{
+				deselectAll();
+			}
 		}
 	}
 }