6 files changed, 33 insertions, 1 deletions

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 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>RenderHighlightSelections</key>
+    <map>
+      <key>Comment</key>
+      <string>Show selection outlines on objects</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>RenderHiddenSelections</key>
     <map>
       <key>Comment</key>
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<LLSelectMgr>
 {
 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<LLEvent> event, const LLSD& userdata)
+        {
+                LLSelectMgr::sRenderSelectionHighlights = !LLSelectMgr::sRenderSelectionHighlights;
+                
+                gSavedSettings.setBOOL("RenderHighlightSelections", LLSelectMgr::sRenderSelectionHighlights);
+                return true;
+        }
+};
+
 class LLToolsShowHiddenSelection : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> 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="" />
         <on_check control="RectangleSelectInclusive" />
       </menu_item_check>
+      <menu_item_separator />
       <menu_item_check name="Show Hidden Selection"
                        label="Show Hidden Selection">
         <on_click function="Tools.ShowHiddenSelection"
@@ -583,6 +584,11 @@
                   userdata="" />
         <on_check control="RenderLightRadius" />
       </menu_item_check>
+      <menu_item_check label="Show Selection Outlines"
+                       name="Show Selection Outlines">
+        <on_click function="Tools.ShowSelectionHighlights" userdata="" />
+        <on_check control="RenderHighlightSelections" />
+      </menu_item_check>
       <menu_item_check name="Show Selection Beam"
                        label="Show Selection Beam">
         <on_click function="ToggleControl"