aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltooldraganddrop.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-10-06 22:12:05 -0700
committerMcCabe Maxsted2009-10-06 22:12:05 -0700
commit23d5c59f6833156ee0714ecfba8194dd8708c730 (patch)
tree4ab05bf6af6da511c6d5072d42c2cb70570c5a11 /linden/indra/newview/lltooldraganddrop.cpp
parentTiny improvement to radar code (diff)
downloadmeta-impy-23d5c59f6833156ee0714ecfba8194dd8708c730.zip
meta-impy-23d5c59f6833156ee0714ecfba8194dd8708c730.tar.gz
meta-impy-23d5c59f6833156ee0714ecfba8194dd8708c730.tar.bz2
meta-impy-23d5c59f6833156ee0714ecfba8194dd8708c730.tar.xz
Applied RLVa-1.0.2c_20091005_Imprudence-1.2.0-diff.patch
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lltooldraganddrop.cpp4
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 }