From e79a1cc54985e3d9b5e5e0229251ad06c955b1b9 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 16 Jan 2009 22:55:58 -0700 Subject: Removed/moved unnecessary options --- linden/indra/newview/llpanelgeneral.cpp | 8 ++++ linden/indra/newview/llpanelgeneral.h | 1 + linden/indra/newview/llviewermenu.cpp | 42 --------------------- .../skins/default/xui/en-us/menu_viewer.xml | 43 ++++++++-------------- .../xui/en-us/panel_preferences_general.xml | 6 ++- 5 files changed, 30 insertions(+), 70 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp index 47bc60e..16da49d 100644 --- a/linden/indra/newview/llpanelgeneral.cpp +++ b/linden/indra/newview/llpanelgeneral.cpp @@ -109,6 +109,7 @@ LLPanelGeneral::LLPanelGeneral() BOOL LLPanelGeneral::postBuild() { childSetCommitCallback("fade_out_combobox", set_render_name_fade_out); + childSetAction("reset_ui_size", onClickResetUISize, this); std::string region_name_prompt = getString("region_name_prompt"); @@ -242,3 +243,10 @@ void LLPanelGeneral::clickShowStartLocation(LLUICtrl*, void* user_data) { LLPanelLogin::refreshLocation( false ); // in case LLPanelLogin is visible } + +// static +void LLPanelGeneral::onClickResetUISize(void* user_data) +{ + gSavedSettings.setF32("UIScaleFactor", 1.0f); + gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight()); +} \ No newline at end of file diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h index 95a95f8..00dc874 100644 --- a/linden/indra/newview/llpanelgeneral.h +++ b/linden/indra/newview/llpanelgeneral.h @@ -56,6 +56,7 @@ public: static void clickShowStartLocation(LLUICtrl*, void* user_data); static void set_start_location(LLUICtrl* ctrl, void* data); static void set_specific_start_location(LLLineEditor* line_editor, void* data); + static void onClickResetUISize(void*); protected: S32 mRenderName; diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index f99a324..d607afe 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -1642,7 +1642,6 @@ class LLObjectEnableOpen : public view_listener_t } }; - class LLViewCheckBuildMode : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) @@ -3239,17 +3238,6 @@ class LLViewFullscreen : public view_listener_t } }; -class LLViewDefaultUISize : public view_listener_t -{ - bool handleEvent(LLPointer event, const LLSD& userdata) - { - gSavedSettings.setF32("UIScaleFactor", 1.0f); - gSavedSettings.setBOOL("UIAutoScale", FALSE); - gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight()); - return true; - } -}; - class LLEditDuplicate : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) @@ -5086,10 +5074,6 @@ class LLShowFloater : public view_listener_t { LLFloaterPreference::show(NULL); } - else if (floater_name == "toolbar") - { - LLToolBar::toggle(NULL); - } else if (floater_name == "chat history") { LLFloaterChat::toggleInstance(LLSD()); @@ -5222,10 +5206,6 @@ class LLFloaterVisible : public view_listener_t { new_value = LLFloaterMyFriends::instanceVisible(0); } - else if (floater_name == "toolbar") - { - new_value = LLToolBar::visible(NULL); - } else if (floater_name == "chat history") { new_value = LLFloaterChat::instanceVisible(); @@ -7229,25 +7209,6 @@ class LLViewCheckRenderType : public view_listener_t } }; -class LLViewShowHUDAttachments : public view_listener_t -{ - bool handleEvent(LLPointer event, const LLSD& userdata) - { - LLPipeline::sShowHUDAttachments = !LLPipeline::sShowHUDAttachments; - return true; - } -}; - -class LLViewCheckHUDAttachments : public view_listener_t -{ - bool handleEvent(LLPointer event, const LLSD& userdata) - { - bool new_value = LLPipeline::sShowHUDAttachments; - gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value); - return true; - } -}; - class LLEditEnableTakeOff : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) @@ -9702,12 +9663,10 @@ void initialize_menus() addMenu(new LLViewToggleBeacon(), "View.ToggleBeacon"); addMenu(new LLViewBeaconWidth(), "View.BeaconWidth"); addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType"); - addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments"); addMenu(new LLViewZoomOut(), "View.ZoomOut"); addMenu(new LLViewZoomIn(), "View.ZoomIn"); addMenu(new LLViewZoomDefault(), "View.ZoomDefault"); addMenu(new LLViewFullscreen(), "View.Fullscreen"); - addMenu(new LLViewDefaultUISize(), "View.DefaultUISize"); addMenu(new LLViewEnableMouselook(), "View.EnableMouselook"); addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter"); @@ -9718,7 +9677,6 @@ void initialize_menus() addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent"); addMenu(new LLViewCheckBeaconEnabled(), "View.CheckBeaconEnabled"); addMenu(new LLViewCheckRenderType(), "View.CheckRenderType"); - addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments"); // World menu addMenu(new LLWorldChat(), "World.Chat"); 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 89c1fe8..a741b94 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 @@ -281,10 +281,6 @@ - - - - @@ -428,7 +424,7 @@ userdata="hideparticles" /> - @@ -444,34 +440,27 @@ - - - - - - - - - - - - - + + + + + + + + + + + - - - diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml index 092daab..7bd966a 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml @@ -63,7 +63,11 @@ + name="UI Scale" show_text="true" value="1" width="220" /> +