diff options
author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-15 18:49:09 +0200 |
---|---|---|
committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-15 18:49:09 +0200 |
commit | ed202aaad52bcf934e89fd4e51d7217d2990574e (patch) | |
tree | 9074b6257550cb3b835b7fbd3b83e462e1348fa0 /indra/newview/llfloaterpreference.h | |
parent | dbc37f6ca74dba6c6d5194e0397d5cfe6f570c1d (diff) | |
parent | 7a088e9b2c8ffddbf5cd8dad72281a64a32d7c63 (diff) |
merging into latest changes
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
-rw-r--r-- | indra/newview/llfloaterpreference.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 10a416beb5..4c1c122fb1 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -82,6 +82,8 @@ public: void processProfileProperties(const LLAvatarData* pAvatarData ); void storeAvatarProperties( const LLAvatarData* pAvatarData ); void saveAvatarProperties( void ); + void selectPrivacyPanel(); + void selectChatPanel(); protected: void onBtnOK(); @@ -164,6 +166,8 @@ public: void buildPopupLists(); static void refreshSkin(void* data); + void selectPanel(const LLSD& name); + private: static std::string sSkin; bool mClickActionDirty; ///< Set to true when the click/double-click options get changed by user. |