diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-28 17:52:06 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-28 17:52:06 -0700 |
| commit | a6adc00632d53445159b3ee91ecddea3fc667bff (patch) | |
| tree | 858b59d3c17341ed43ffd746593cc4c206294242 /indra/newview/llselectmgr.cpp | |
| parent | b6ba0da7f5e8d830f776ec974287b2d451a4715f (diff) | |
| parent | 3bed004b5bb82e203d2e98ffc5d87273ea1dacc4 (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, |