From 5a376379b6eeca8ecb709d5415ac130a1a99b4be Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 7 Nov 2009 16:21:26 -0700 Subject: Applied RLVa-1.0.5e_20091107_Imprudence-1.2.0-diff.patch --- linden/indra/newview/pipeline.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linden/indra/newview/pipeline.cpp') diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index efb5ff6..bf7799c 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp @@ -1797,10 +1797,10 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera) { // if (drawablep->getVObj().notNull() && // drawablep->getVObj()->isSelected()) -// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) +// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a LLViewerObject* pObj = drawablep->getVObj(); if ( (pObj) && (pObj->isSelected()) && - ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (gRlvHandler.isDetachable(pObj))) ) + ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (!gRlvHandler.isLockedAttachment(pObj, RLV_LOCK_REMOVE))) ) // [/RVLa:KB] { return; -- cgit v1.1