diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 16:50:21 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 16:50:21 -0800 |
| commit | 5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (patch) | |
| tree | 5d0141f43cfaf59e5cb62eb2f4ca9541160e6173 /indra/newview/llfloaterpreference.h | |
| parent | 3ab4b0f58326a01a09aa99f262c03d2703215af2 (diff) | |
| parent | 6e932911d5b0a02b44caf3bf81a9c00fd0e1dc89 (diff) | |
warn-on-failure:unix-eol
automated merge from trunk
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 6f382620ee..8b02a4049d 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -166,6 +166,9 @@ public: virtual void saveSettings(); private: + //for "Only friends and groups can call or IM me" + static void showFriendsOnlyWarning(LLUICtrl*, const LLSD&); + typedef std::map<LLControlVariable*, LLSD> control_values_map_t; control_values_map_t mSavedValues; |