From aeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Mon, 15 Jan 2007 18:49:02 +0000
Subject: svn merge -r 56599:56738
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

---
 indra/newview/llviewermenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewermenu.cpp')

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 8ab2b52a50..a305c1cfa4 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -6828,7 +6828,6 @@ void near_attach_object(BOOL success, void *user_data)
 	}
 	
 	gSelectMgr->sendAttach(attachment_id);
-	gSelectMgr->deselectTransient();
 }
 
 class LLObjectAttachToAvatar : public view_listener_t
@@ -6866,6 +6865,7 @@ void confirm_replace_attachment(S32 option, void* user_data)
 {
 	if (option == 0/*YES*/)
 	{
+		gSelectMgr->convertTransient();
 		LLViewerObject* selectedObject = gSelectMgr->getFirstRootObject();
 		if (selectedObject)
 		{
-- 
cgit v1.2.3