diff options
| author | McCabe Maxsted | 2009-11-08 13:23:54 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-08 13:23:54 -0700 |
| commit | d9ecd6fde8f588d8be9a54a3ebc301bab1e99754 (patch) | |
| tree | 1f595f7577a5134b29e4933d1ce6b4b52e9c1f57 /linden/indra/newview/pipeline.cpp | |
| parent | Merged working branch of 1.2 into LL 1.23 merge (diff) | |
| parent | Changed version to 1.20 in other files (diff) | |
| download | meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.zip meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.gz meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.bz2 meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.xz | |
Merged almost-final version of Imprudence 1.2 into 1.3
Diffstat (limited to 'linden/indra/newview/pipeline.cpp')
| -rw-r--r-- | linden/indra/newview/pipeline.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index 6fb2cec..4ea9e41 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp | |||
| @@ -1965,10 +1965,10 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera) | |||
| 1965 | { | 1965 | { |
| 1966 | // if (drawablep->getVObj().notNull() && | 1966 | // if (drawablep->getVObj().notNull() && |
| 1967 | // drawablep->getVObj()->isSelected()) | 1967 | // drawablep->getVObj()->isSelected()) |
| 1968 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | 1968 | // [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a |
| 1969 | LLViewerObject* pObj = drawablep->getVObj(); | 1969 | LLViewerObject* pObj = drawablep->getVObj(); |
| 1970 | if ( (pObj) && (pObj->isSelected()) && | 1970 | if ( (pObj) && (pObj->isSelected()) && |
| 1971 | ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (gRlvHandler.isDetachable(pObj))) ) | 1971 | ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (!gRlvHandler.isLockedAttachment(pObj, RLV_LOCK_REMOVE))) ) |
| 1972 | // [/RVLa:KB] | 1972 | // [/RVLa:KB] |
| 1973 | { | 1973 | { |
| 1974 | return; | 1974 | return; |