diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-25 12:39:46 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-25 12:39:46 -0700 |
| commit | 9aad318fb9b9480a87d87db902dd2f064d9348af (patch) | |
| tree | 2ee6663288dd21f03444a435addbb1925dd389e6 /indra/newview/llselectmgr.cpp | |
| parent | 18a476daceccd337e990eec367cac5b985c8836f (diff) | |
| parent | 62cd50fe1edd67308cf0a2e5407bd4005e705681 (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index af16b962e6..050b87bbe0 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -3629,9 +3629,10 @@ void LLSelectMgr::sendAttach(U8 attachment_point) if (0 == attachment_point || get_if_there(gAgentAvatarp->mAttachmentPoints, (S32)attachment_point, (LLViewerJointAttachment*)NULL)) { -#if ENABLE_MULTIATTACHMENTS - attachment_point |= ATTACHMENT_ADD; -#endif + + if (gSavedSettings.getBOOL("MultipleAttachments")) + attachment_point |= ATTACHMENT_ADD; + sendListToRegions( "ObjectAttach", packAgentIDAndSessionAndAttachment, |