diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llvovolume.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp index adf82cd..7b151e8 100644 --- a/linden/indra/newview/llvovolume.cpp +++ b/linden/indra/newview/llvovolume.cpp | |||
@@ -1943,9 +1943,9 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e | |||
1943 | { | 1943 | { |
1944 | if (!mbCanSelect || | 1944 | if (!mbCanSelect || |
1945 | // (gHideSelectedObjects && isSelected()) || | 1945 | // (gHideSelectedObjects && isSelected()) || |
1946 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | 1946 | // [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a |
1947 | ( (gHideSelectedObjects && isSelected()) && | 1947 | ( (gHideSelectedObjects && isSelected()) && |
1948 | ((!rlv_handler_t::isEnabled()) || (!isHUDAttachment()) || (gRlvHandler.isDetachable(this))) ) || | 1948 | ((!rlv_handler_t::isEnabled()) || (!isHUDAttachment()) || (!gRlvHandler.isLockedAttachment(this, RLV_LOCK_REMOVE))) ) || |
1949 | // [/RLVa:KB] | 1949 | // [/RLVa:KB] |
1950 | mDrawable->isDead() || | 1950 | mDrawable->isDead() || |
1951 | !gPipeline.hasRenderType(mDrawable->getRenderType())) | 1951 | !gPipeline.hasRenderType(mDrawable->getRenderType())) |
@@ -2092,10 +2092,10 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, | |||
2092 | // { | 2092 | // { |
2093 | // return; | 2093 | // return; |
2094 | // } | 2094 | // } |
2095 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | 2095 | // [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a |
2096 | LLViewerObject* pObj = facep->getViewerObject(); | 2096 | LLViewerObject* pObj = facep->getViewerObject(); |
2097 | if ( (pObj->isSelected() && gHideSelectedObjects) && | 2097 | if ( (pObj->isSelected() && gHideSelectedObjects) && |
2098 | ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (gRlvHandler.isDetachable(pObj))) ) | 2098 | ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (!gRlvHandler.isLockedAttachment(pObj, RLV_LOCK_REMOVE))) ) |
2099 | { | 2099 | { |
2100 | return; | 2100 | return; |
2101 | } | 2101 | } |