1 files changed, 10 insertions, 0 deletions

diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 256f02a..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");
 
@@ -199,6 +200,7 @@ void LLPanelGeneral::refresh()
         mChatOnlineNotification = gSavedSettings.getBOOL("ChatOnlineNotification");
         mAFKTimeout = gSavedSettings.getF32("AFKTimeout");
         mMiniMapRotate = gSavedSettings.getBOOL("MiniMapRotate");
+        mMiniMapTeleport = gSavedSettings.getBOOL("MiniMapTeleport");
         mNotifyMoney = gSavedSettings.getBOOL("NotifyMoneyChange");
         mUseDefaultColor = gSavedSettings.getBOOL("UseDefaultColorPicker");
         mEffectColor = gSavedSettings.getColor4("EffectColor");
@@ -223,6 +225,7 @@ void LLPanelGeneral::cancel()
         gSavedSettings.setBOOL("ChatOnlineNotification", mChatOnlineNotification );
         gSavedSettings.setF32("AFKTimeout", mAFKTimeout );
         gSavedSettings.setBOOL("MiniMapRotate", mMiniMapRotate );
+        gSavedSettings.setBOOL("MiniMapTeleport", mMiniMapTeleport);
         gSavedSettings.setBOOL("NotifyMoneyChange", mNotifyMoney );
         gSavedSettings.setBOOL("UseDefaultColorPicker", mUseDefaultColor );
         gSavedSettings.setBOOL("ShowSearchBar", mShowSearch);
@@ -240,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