aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-13 00:21:47 -0700
committerMcCabe Maxsted2009-06-13 00:21:47 -0700
commit622903e3c0b9db7bb7c38e0b35bda80919eb3345 (patch)
tree0392d06941ca299fc892040bded3ca7db0030965 /linden/indra/newview/llselectmgr.cpp
parentApplied patch by Robin Cornelius for VWR-12686: LLTextureCache::writeToCache(... (diff)
downloadmeta-impy-622903e3c0b9db7bb7c38e0b35bda80919eb3345.zip
meta-impy-622903e3c0b9db7bb7c38e0b35bda80919eb3345.tar.gz
meta-impy-622903e3c0b9db7bb7c38e0b35bda80919eb3345.tar.bz2
meta-impy-622903e3c0b9db7bb7c38e0b35bda80919eb3345.tar.xz
Applied Aimee's patch for VWR-6918: Hide/Show Selection Outlines
Diffstat (limited to 'linden/indra/newview/llselectmgr.cpp')
-rw-r--r--linden/indra/newview/llselectmgr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 7afe073..998cc50 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -106,6 +106,7 @@ BOOL gHideSelectedObjects = FALSE;
106BOOL gAllowSelectAvatar = FALSE; 106BOOL gAllowSelectAvatar = FALSE;
107 107
108BOOL LLSelectMgr::sRectSelectInclusive = TRUE; 108BOOL LLSelectMgr::sRectSelectInclusive = TRUE;
109BOOL LLSelectMgr::sRenderSelectionHighlights = TRUE;
109BOOL LLSelectMgr::sRenderHiddenSelections = TRUE; 110BOOL LLSelectMgr::sRenderHiddenSelections = TRUE;
110BOOL LLSelectMgr::sRenderLightRadius = FALSE; 111BOOL LLSelectMgr::sRenderLightRadius = FALSE;
111F32 LLSelectMgr::sHighlightThickness = 0.f; 112F32 LLSelectMgr::sHighlightThickness = 0.f;
@@ -4823,7 +4824,7 @@ void LLSelectMgr::updateSilhouettes()
4823 4824
4824void LLSelectMgr::renderSilhouettes(BOOL for_hud) 4825void LLSelectMgr::renderSilhouettes(BOOL for_hud)
4825{ 4826{
4826 if (!mRenderSilhouettes) 4827 if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights)
4827 { 4828 {
4828 return; 4829 return;
4829 } 4830 }