From 622903e3c0b9db7bb7c38e0b35bda80919eb3345 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 13 Jun 2009 00:21:47 -0700 Subject: Applied Aimee's patch for VWR-6918: Hide/Show Selection Outlines --- ChangeLog.txt | 13 +++++++++++++ linden/indra/newview/app_settings/settings.xml | 11 +++++++++++ linden/indra/newview/llappviewer.cpp | 1 + linden/indra/newview/llselectmgr.cpp | 3 ++- linden/indra/newview/llselectmgr.h | 1 + linden/indra/newview/llviewermenu.cpp | 12 ++++++++++++ .../indra/newview/skins/default/xui/en-us/menu_viewer.xml | 6 ++++++ 7 files changed, 46 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index cc78998..db9529c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -4,6 +4,19 @@ LLTextureCache::writeToCache() does not cache textures smaller than TEXTURE_CACHE_ENTRY_SIZE modified: linden/indra/newview/lltexturecache.cpp + + + Aimee Trescothick + + * VWR-6918: Hide/Show Selection Outlines. + + modified: indra/newview/app_settings/settings.xml + modified: indra/newview/llappviewer.cpp + modified: indra/newview/llselectmgr.cpp + modified: indra/newview/llselectmgr.h + modified: indra/newview/llviewermenu.cpp + modified: indra/newview/skins/default/xui/en-us/menu_viewer.xml + 2009-06-11 McCabe Maxsted diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 4947c45..ba2a9e4 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -6210,6 +6210,17 @@ Value 0 + RenderHighlightSelections + + Comment + Show selection outlines on objects + Persist + 1 + Type + Boolean + Value + 1 + RenderHiddenSelections Comment diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 4ab5d8d..488cfcf 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -392,6 +392,7 @@ static void settings_to_globals() LLFolderView::sAutoOpenTime = llmax(0.25f, gSavedSettings.getF32("FolderAutoOpenDelay")); LLToolBar::sInventoryAutoOpenTime = gSavedSettings.getF32("InventoryAutoOpenDelay"); LLSelectMgr::sRectSelectInclusive = gSavedSettings.getBOOL("RectangleSelectInclusive"); + LLSelectMgr::sRenderSelectionHighlights = gSavedSettings.getBOOL("RenderHighlightSelections"); LLSelectMgr::sRenderHiddenSelections = gSavedSettings.getBOOL("RenderHiddenSelections"); LLSelectMgr::sRenderLightRadius = gSavedSettings.getBOOL("RenderLightRadius"); 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; BOOL gAllowSelectAvatar = FALSE; BOOL LLSelectMgr::sRectSelectInclusive = TRUE; +BOOL LLSelectMgr::sRenderSelectionHighlights = TRUE; BOOL LLSelectMgr::sRenderHiddenSelections = TRUE; BOOL LLSelectMgr::sRenderLightRadius = FALSE; F32 LLSelectMgr::sHighlightThickness = 0.f; @@ -4823,7 +4824,7 @@ void LLSelectMgr::updateSilhouettes() void LLSelectMgr::renderSilhouettes(BOOL for_hud) { - if (!mRenderSilhouettes) + if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights) { return; } diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h index a332053..3f32373 100644 --- a/linden/indra/newview/llselectmgr.h +++ b/linden/indra/newview/llselectmgr.h @@ -337,6 +337,7 @@ class LLSelectMgr : public LLEditMenuHandler, public LLSingleton { public: static BOOL sRectSelectInclusive; // do we need to surround an object to pick it? + static BOOL sRenderSelectionHighlights; // do we show selection silhouettes? static BOOL sRenderHiddenSelections; // do we show selection silhouettes that are occluded? static BOOL sRenderLightRadius; // do we show the radius of selected lights? static F32 sHighlightThickness; diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 838f230..2940bdd 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -6625,6 +6625,17 @@ class LLToolsSelectBySurrounding : public view_listener_t } }; +class LLToolsShowSelectionHighlights : public view_listener_t +{ + bool handleEvent(LLPointer event, const LLSD& userdata) + { + LLSelectMgr::sRenderSelectionHighlights = !LLSelectMgr::sRenderSelectionHighlights; + + gSavedSettings.setBOOL("RenderHighlightSelections", LLSelectMgr::sRenderSelectionHighlights); + return true; + } +}; + class LLToolsShowHiddenSelection : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) @@ -9571,6 +9582,7 @@ void initialize_menus() addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects"); addMenu(new LLToolsSelectOnlyCopyableObjects(), "Tools.SelectOnlyCopyableObjects"); addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding"); + addMenu(new LLToolsShowSelectionHighlights(), "Tools.ShowSelectionHighlights"); addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection"); addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius"); addMenu(new LLToolsEditLinkedParts(), "Tools.EditLinkedParts"); diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index e085b21..f837029 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -571,6 +571,7 @@ userdata="" /> + + + + +