diff options
| author | Jacek Antonelli | 2009-10-09 10:11:45 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-10-09 10:11:45 -0500 |
| commit | bb657bd4244d0b1b80f368a30e40531f573d3c5f (patch) | |
| tree | aef4e3c075ba760f48963d76c9300b6a8b323bf9 /linden/indra/newview/lltooldraganddrop.cpp | |
| parent | Grid manager no longer appends "/" to URIs. (diff) | |
| parent | Fixed money change notification happening after logout/login (diff) | |
| download | meta-impy-bb657bd4244d0b1b80f368a30e40531f573d3c5f.zip meta-impy-bb657bd4244d0b1b80f368a30e40531f573d3c5f.tar.gz meta-impy-bb657bd4244d0b1b80f368a30e40531f573d3c5f.tar.bz2 meta-impy-bb657bd4244d0b1b80f368a30e40531f573d3c5f.tar.xz | |
Merge remote branch 'mccabe/next' into next
Diffstat (limited to 'linden/indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | linden/indra/newview/lltooldraganddrop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp index c99ccbf..178bde6 100644 --- a/linden/indra/newview/lltooldraganddrop.cpp +++ b/linden/indra/newview/lltooldraganddrop.cpp | |||
| @@ -2014,10 +2014,10 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv( | |||
| 2014 | return ACCEPT_NO; | 2014 | return ACCEPT_NO; |
| 2015 | } | 2015 | } |
| 2016 | 2016 | ||
| 2017 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-1.0.0c | 2017 | // [RLVa:KB] - Checked: 2009-09-08 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c |
| 2018 | LLViewerJointAttachment* pAttachPt = NULL; | 2018 | LLViewerJointAttachment* pAttachPt = NULL; |
| 2019 | if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) && (!RlvSettings::getEnableWear()) && | 2019 | if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) && (!RlvSettings::getEnableWear()) && |
| 2020 | ( ((pAttachPt = gRlvHandler.getAttachPoint(item, true)) == NULL) || (!gRlvHandler.isDetachable(pAttachPt->getObject())) ) ) | 2020 | ( ((pAttachPt = gRlvHandler.getAttachPoint(item, true)) == NULL) || (!gRlvHandler.isDetachable(pAttachPt)) ) ) |
| 2021 | { | 2021 | { |
| 2022 | return ACCEPT_NO_LOCKED; | 2022 | return ACCEPT_NO_LOCKED; |
| 2023 | } | 2023 | } |