From afb08192247138b8e8d86671a6dc001e041d1c82 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 3 Jun 2015 12:23:29 +0300 Subject: MAINT-1788 FIXED Cancel changes when clicking Close button or exiting Viewer. --- indra/newview/llfloaterpreference.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterpreference.h') diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 7bf6ae7d79..b3878457e2 100755 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -269,6 +269,7 @@ protected: void saveSettings(); void onBtnOk(); void onBtnCancel(); + void onClickCloseBtn(bool app_quitting = false); void onChangeSocksSettings(); -- cgit v1.2.3 From 3e0f31f406d4376fd9cd59b306fda5775ea5c4e6 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 23 Jun 2015 12:47:54 +0300 Subject: MAINT-5001 FIXED Logging in and then quickly logging out removes stored favorite login locations --- indra/newview/llfloaterpreference.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterpreference.h') diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index b3878457e2..04e5e37731 100755 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -229,7 +229,7 @@ private: //for "Only friends and groups can call or IM me" static void showFriendsOnlyWarning(LLUICtrl*, const LLSD&); //for "Show my Favorite Landmarks at Login" - static void showFavoritesOnLoginWarning(LLUICtrl* checkbox, const LLSD& value); + static void handleFavoritesOnLoginChanged(LLUICtrl* checkbox, const LLSD& value); typedef std::map string_color_map_t; string_color_map_t mSavedColors; -- cgit v1.2.3