diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cd7a005d46..cef6b9d22d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -18891,18 +18891,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 3.0 - - FSUseV1Menus - - Comment - Toggles the display of V1-like viewer menus - Persist - 0 - Type - Boolean - Value - 0 - _NACL_MLFovValues diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index f940cdb5c9..af83bd8227 100755 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -934,7 +934,6 @@ void settings_setup_listeners() gSavedSettings.getControl("LoginLocation")->getSignal()->connect(boost::bind(&handleLoginLocationChanged)); // FIRE-9759 - Temporarily remove AvatarZOffset since it's broken //gSavedPerAccountSettings.getControl("AvatarZOffset")->getSignal()->connect(boost::bind(&handleAvatarZOffsetChanged, _2)); // ## Zi: Moved Avatar Z offset from RLVa to here - gSavedSettings.getControl("FSUseV1Menus")->getSignal()->connect(boost::bind(&show_v1_menus)); // V1 menu system -WoLf // Is done inside XUI now, using visibility_control // gSavedSettings.getControl("ShowNavbarFavoritesPanel")->getSignal()->connect(boost::bind(&toggle_show_favorites_panel, _2)); // diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index dfc4d9dedf..356fabc393 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6597,70 +6597,6 @@ void toggle_debug_menus(void*) show_debug_menus(); } -void toggle_v1_menus(void*) // V1 menu system -WoLf -{ - BOOL visible = ! gSavedSettings.getBOOL("FSUseV1Menus"); - gSavedSettings.setBOOL("FSUseV1Menus", visible); - show_v1_menus(); -} - -// AO This may be called a few seconds after activations, to reset it back to V2-style -void menuTimerV1() -{ - gSavedSettings.setBOOL("FSUseV1Menus", FALSE); - show_v1_menus(); -} - -void show_v1_menus() // V1 menu system -WoLf -{ - BOOL V1 = gSavedSettings.getBOOL("FSUseV1Menus"); - rlvCallbackTimerOnce(30, boost::bind(&menuTimerV1)); - - if ( gMenuBarView ) - { - // The original menu system - gMenuBarView->setItemVisible("Me", !V1); - gMenuBarView->setItemEnabled("Me", !V1); - gMenuBarView->setItemVisible("Communicate", !V1); - gMenuBarView->setItemEnabled("Communicate", !V1); - gMenuBarView->setItemVisible("World", !V1); - gMenuBarView->setItemEnabled("World", !V1); - gMenuBarView->setItemVisible("BuildTools", !V1); - gMenuBarView->setItemEnabled("BuildTools", !V1); - gMenuBarView->setItemVisible("Content", !V1); - gMenuBarView->setItemEnabled("Content", !V1); - gMenuBarView->setItemVisible("Help", !V1); - gMenuBarView->setItemEnabled("Help", !V1); - gMenuBarView->setItemVisible("Advanced", !V1); - gMenuBarView->setItemEnabled("Advanced", !V1); - gMenuBarView->setItemVisible("Develop", !V1); - gMenuBarView->setItemEnabled("Develop", !V1); - - // The V1 menu system - gMenuBarView->setItemVisible("V1-File", V1); - gMenuBarView->setItemEnabled("V1-File", V1); - gMenuBarView->setItemVisible("V1-Edit", V1); - gMenuBarView->setItemEnabled("V1-Edit", V1); - gMenuBarView->setItemVisible("V1-View", V1); - gMenuBarView->setItemEnabled("V1-View", V1); - gMenuBarView->setItemVisible("V1-World", V1); - gMenuBarView->setItemEnabled("V1-World", V1); - gMenuBarView->setItemVisible("V1-Tools", V1); - gMenuBarView->setItemEnabled("V1-Tools", V1); - gMenuBarView->setItemVisible("V1-Help", V1); - gMenuBarView->setItemEnabled("V1-Help", V1); - gMenuBarView->setItemVisible("V1-Firestorm", V1); - gMenuBarView->setItemEnabled("V1-Firestorm", V1); - gMenuBarView->setItemVisible("V1-Advanced", V1); - gMenuBarView->setItemEnabled("V1-Advanced", V1); - - if (V1 == false) - { - show_debug_menus(); - } - } -} - // LLUUID gExporterRequestID; // std::string gExportDirectory; diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index ce84fbf098..b3f47cb95f 100755 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -65,9 +65,6 @@ void handle_duplicate(void*); void handle_duplicate_in_place(void*); BOOL enable_not_have_card(void *userdata); void process_grant_godlike_powers(LLMessageSystem* msg, void**); -void show_v1_menus(); // V1 menu system -WoLf -void toggle_v1_menus(void*); // V1 menu system -WoLf -void menuTimerV1(); BOOL enable_cut(void*); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 1898443e46..02de354e43 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -3020,22 +3020,6 @@ function="ToggleControl" parameter="QAMode" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -