1 files changed, 13 insertions, 3 deletions

diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index ebf2f91..4ea9e41 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -1963,8 +1963,13 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
         
         if (gHideSelectedObjects)
         {
-                if (drawablep->getVObj().notNull() &&
-                        drawablep->getVObj()->isSelected())
+//              if (drawablep->getVObj().notNull() &&
+//                      drawablep->getVObj()->isSelected())
+// [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.isLockedAttachment(pObj, RLV_LOCK_REMOVE))) )
+// [/RVLa:KB]
                 {
                         return;
                 }
@@ -2294,7 +2299,7 @@ void LLPipeline::postSort(LLCamera& camera)
         }
         
         // only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus
-        if (gSavedSettings.getBOOL("BeaconAlwaysOn") && !sShadowRender)
+        if (gSavedSettings.getBOOL("BeaconsEnabled") && !sShadowRender)
         {
                 if (sRenderScriptedTouchBeacons)
                 {
@@ -4184,6 +4189,11 @@ void LLPipeline::enableLightsAvatar()
 
 void LLPipeline::enableLightsAvatarEdit(const LLColor4& color)
 {
+        if (mLightingDetail < 1)
+        {
+                return;
+        }
+
         U32 mask = 0x2002; // Avatar backlight only, set ambient
         setupAvatarLights(TRUE);
         enableLights(mask);