diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-13 08:43:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-13 08:43:03 -0400 |
| commit | 69ff937e47248eca0a4f876efebe97ee57bd4da9 (patch) | |
| tree | 4fde61ed0ed439b0bf033b15f6703d72bee6f561 /indra/newview/llfloaterpreference.h | |
| parent | 9367a3787929dfff8b46763d9a7b4872c469e85a (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
merge changes for 3.8.5-release
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rwxr-xr-x | indra/newview/llfloaterpreference.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 651b8d8563..03dab13689 100755 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -234,7 +234,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<std::string, LLColor4> string_color_map_t; string_color_map_t mSavedColors; @@ -305,6 +305,7 @@ protected: void saveSettings(); void onBtnOk(); void onBtnCancel(); + void onClickCloseBtn(bool app_quitting = false); void onChangeSocksSettings(); |