diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-28 21:04:29 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-28 21:04:29 +0100 |
| commit | 84f417f9ab8167c79989337e954d5504cbd9d9e2 (patch) | |
| tree | 040923e87ca6de31cb38f77d62f34a2e940f0f77 /indra/newview/llselectmgr.cpp | |
| parent | ac52aa08862833ab243fb6afc8c20d148e02c55c (diff) | |
| parent | ec36c092a2a5995983a2dc97662c4de3e408ead4 (diff) | |
merge from viewer-trunk
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 cfa05987ab..e66be1023d 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, |