diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0897c92ac5..84d60cd10f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -120,6 +120,17 @@ Value 1 + PieMenuOuterRingShade + + Comment + If enabled, a shade around the outside of the pie menu will be drawn, adding a further visualization of sub menus. + Persist + 1 + Type + Boolean + Value + 1 + AutohideChatBar Comment diff --git a/indra/newview/piemenu.cpp b/indra/newview/piemenu.cpp index ceaba7548f..41ad961f25 100644 --- a/indra/newview/piemenu.cpp +++ b/indra/newview/piemenu.cpp @@ -288,6 +288,7 @@ void PieMenu::draw() selectedColor = LLUIColorTable::instance().getColor("PieMenuSelectedColorOverride"); } static LLCachedControl sPieMenuPopupFontEffect(gSavedSettings, "PieMenuPopupFontEffect"); + static LLCachedControl sPieMenuOuterRingShade(gSavedSettings, "PieMenuOuterRingShade"); // on first click, make the menu fade out to indicate "borderless" operation if (mFirstClick) @@ -410,7 +411,10 @@ void PieMenu::draw() else if (currentSubmenu) { label = currentSubmenu->getLabel(); - gl_washer_segment_2d(PIE_OUTER_SIZE * PIE_OUTER_SHADE_FACTOR * factor, PIE_OUTER_SIZE * factor, segmentStart + 0.02f, segmentStart + F_PI / 4.f - 0.02f, steps / 8, selectedColor, selectedColor); + if (sPieMenuOuterRingShade) + { + gl_washer_segment_2d(PIE_OUTER_SIZE * PIE_OUTER_SHADE_FACTOR * factor, PIE_OUTER_SIZE * factor, segmentStart + 0.02f, segmentStart + F_PI / 4.f - 0.02f, steps / 8, selectedColor, selectedColor); + } } // if it's a slice or submenu, the mouse pointer is over the same segment as our counter and the item is enabled @@ -457,7 +461,10 @@ void PieMenu::draw() if (!mFirstClick) { gl_washer_2d(PIE_OUTER_SIZE * factor, PIE_OUTER_SIZE * factor - 2.f, steps, lineColor, borderColor); - gl_washer_2d(PIE_OUTER_SIZE * PIE_OUTER_SHADE_FACTOR * factor, PIE_OUTER_SIZE * factor - 2.f, steps, lineColor, borderColor); + if (sPieMenuOuterRingShade) + { + gl_washer_2d(PIE_OUTER_SIZE * PIE_OUTER_SHADE_FACTOR * factor, PIE_OUTER_SIZE * factor - 2.f, steps, lineColor, borderColor); + } } gl_washer_2d(PIE_INNER_SIZE + 1, PIE_INNER_SIZE - 1, steps, borderColor, lineColor); diff --git a/indra/newview/skins/default/xui/de/panel_preferences_UI.xml b/indra/newview/skins/default/xui/de/panel_preferences_UI.xml index 49a9708591..2a9e73f82c 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_UI.xml @@ -60,6 +60,7 @@ + (Erfordert Neustart) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml index 186a780725..efb401262d 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml @@ -414,6 +414,17 @@ name="PieMenuPopupFontEffect" tool_tip="Enables the text within the pie menu being part of the animation when the pie menu opens." top_pad="3" + width="256" /> +