diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
| commit | aeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 (patch) | |
| tree | 5aedb2a22e54d9c2c2fe9389d4ad6cebe891c5f1 /indra/newview/llviewermenu.cpp | |
| parent | dbf45ad4294a59c050982b5a417fe86272026454 (diff) | |
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |