diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-24 17:38:12 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-24 17:38:12 -0400 |
| commit | 1a2a25cb857044d3fa6e80d3edaf5c7a15e167a3 (patch) | |
| tree | 3de0e009bcb6312c6ecf702eb925f8c150b5ad59 /indra/newview/llselectmgr.cpp | |
| parent | 90148ccc0132366c1abcb42f75aa9a707c78ba20 (diff) | |
EXT-7747 FIXED Turn on multiattachments for 2.1 as debug setting
This #ifdef is now keyed to MultipleAttachments debug setting
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, |