diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-04-29 02:38:39 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-04-29 02:38:39 +0100 |
| commit | b90ece0936149a69b1176adc4ae2508c61e34fd7 (patch) | |
| tree | 4295b0d766fd6cc80afccac4b689134741b5bb0e /indra/newview/llselectmgr.cpp | |
| parent | 46897efc3efade25feaaa1dc67bc131c35202d12 (diff) | |
| parent | 8c3feea2a2f3bcb648f712f63ea9c4dab8aaa0c3 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index d03a492cd1..2c26bada20 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -3624,14 +3624,14 @@ void LLSelectMgr::sendAttach(U8 attachment_point) return; } -#if ENABLE_MULTIATTACHMENTS - attachment_point |= ATTACHMENT_ADD; -#endif BOOL build_mode = LLToolMgr::getInstance()->inEdit(); // Special case: Attach to default location for this object. if (0 == attachment_point || get_if_there(gAgentAvatarp->mAttachmentPoints, (S32)attachment_point, (LLViewerJointAttachment*)NULL)) { +#if ENABLE_MULTIATTACHMENTS + attachment_point |= ATTACHMENT_ADD; +#endif sendListToRegions( "ObjectAttach", packAgentIDAndSessionAndAttachment, |