diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-12-13 15:52:44 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-12-13 15:52:44 -0800 |
| commit | 56d9d204f76978bf1373e15c84649a87d40dd16d (patch) | |
| tree | c55324326ee8c8b05419d27b49f0b89aa63cd85a /indra/newview/llfloaterpreference.h | |
| parent | 9475a593a170f0c90a8d353de3e1277f844ee913 (diff) | |
| parent | a3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff) | |
Merge
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 973ca25c37..e807038685 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -241,9 +241,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; |