diff options
author | McCabe Maxsted | 2009-06-13 00:21:47 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-13 00:21:47 -0700 |
commit | 622903e3c0b9db7bb7c38e0b35bda80919eb3345 (patch) | |
tree | 0392d06941ca299fc892040bded3ca7db0030965 /linden/indra/newview/llselectmgr.cpp | |
parent | Applied patch by Robin Cornelius for VWR-12686: LLTextureCache::writeToCache(... (diff) | |
download | meta-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.cpp | 3 |
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; | |||
106 | BOOL gAllowSelectAvatar = FALSE; | 106 | BOOL gAllowSelectAvatar = FALSE; |
107 | 107 | ||
108 | BOOL LLSelectMgr::sRectSelectInclusive = TRUE; | 108 | BOOL LLSelectMgr::sRectSelectInclusive = TRUE; |
109 | BOOL LLSelectMgr::sRenderSelectionHighlights = TRUE; | ||
109 | BOOL LLSelectMgr::sRenderHiddenSelections = TRUE; | 110 | BOOL LLSelectMgr::sRenderHiddenSelections = TRUE; |
110 | BOOL LLSelectMgr::sRenderLightRadius = FALSE; | 111 | BOOL LLSelectMgr::sRenderLightRadius = FALSE; |
111 | F32 LLSelectMgr::sHighlightThickness = 0.f; | 112 | F32 LLSelectMgr::sHighlightThickness = 0.f; |
@@ -4823,7 +4824,7 @@ void LLSelectMgr::updateSilhouettes() | |||
4823 | 4824 | ||
4824 | void LLSelectMgr::renderSilhouettes(BOOL for_hud) | 4825 | void LLSelectMgr::renderSilhouettes(BOOL for_hud) |
4825 | { | 4826 | { |
4826 | if (!mRenderSilhouettes) | 4827 | if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights) |
4827 | { | 4828 | { |
4828 | return; | 4829 | return; |
4829 | } | 4830 | } |