diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2010-09-27 09:42:27 -0700 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2010-09-27 09:42:27 -0700 |
| commit | fa22f0a6f8d1144bee20654209342280a772bcae (patch) | |
| tree | adcc7010ffc4e57e49b6ba03b3f652be41a125a1 /indra/newview/llselectmgr.cpp | |
| parent | 753238d70e0db62faaf5ccb50e62cdf96ed4f344 (diff) | |
| parent | 2f29c3511422e29bbdefa43af2fc3fc785c38c86 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 9260abb2ac..da891d1c51 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -181,6 +181,7 @@ template class LLSelectMgr* LLSingleton<class LLSelectMgr>::getInstance(); //----------------------------------------------------------------------------- LLSelectMgr::LLSelectMgr() : mHideSelectedObjects(LLCachedControl<bool>(gSavedSettings, "HideSelectedObjects", FALSE)), + mRenderHighlightSelections(LLCachedControl<bool>(gSavedSettings, "RenderHighlightSelections", TRUE)), mAllowSelectAvatar( LLCachedControl<bool>(gSavedSettings, "AllowSelectAvatar", FALSE)), mDebugSelectMgr(LLCachedControl<bool>(gSavedSettings, "DebugSelectMgr", FALSE)) { @@ -4898,7 +4899,7 @@ void LLSelectMgr::updateSelectionSilhouette(LLObjectSelectionHandle object_handl } void LLSelectMgr::renderSilhouettes(BOOL for_hud) { - if (!mRenderSilhouettes) + if (!mRenderSilhouettes || !mRenderHighlightSelections) { return; } |