diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-12-18 09:51:26 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-12-18 09:51:26 -0800 |
| commit | da60cc476a9586449728c5b507a5cc8354cdf611 (patch) | |
| tree | 07b4f50bd0c56c97e40771e920fdbc9bed44e37d /indra/newview/llfloaterpreference.h | |
| parent | 2069891d736544da3c1460a5b63113b75fe7d61e (diff) | |
| parent | a3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff) | |
Merge viewer-release 6.0.2
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index a4903cd100..da96e68f5e 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -243,9 +243,12 @@ protected: private: //for "Only friends and groups can call or IM me" static void showFriendsOnlyWarning(LLUICtrl*, const LLSD&); + //for "Allow Multiple Viewers" + static void showMultipleViewersWarning(LLUICtrl*, const LLSD&); //for "Show my Favorite Landmarks at Login" static void handleFavoritesOnLoginChanged(LLUICtrl* checkbox, const LLSD& value); + static void toggleMuteWhenMinimized(); typedef std::map<std::string, LLColor4> string_color_map_t; string_color_map_t mSavedColors; |