diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-08 05:19:19 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-08 05:19:19 +0000 |
| commit | f26f7e3e29019abf3a10f6925e30baca19eb4e2d (patch) | |
| tree | 071fd0d451b482c9dd8376479b968da4aa099a78 /indra/newview/llpanelprofileview.h | |
| parent | c5d100a9e4595c0d3bc685e0d6a2972ef228013d (diff) | |
merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
Diffstat (limited to 'indra/newview/llpanelprofileview.h')
| -rw-r--r-- | indra/newview/llpanelprofileview.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/indra/newview/llpanelprofileview.h b/indra/newview/llpanelprofileview.h index 2d89f15fe4..6c5fc77951 100644 --- a/indra/newview/llpanelprofileview.h +++ b/indra/newview/llpanelprofileview.h @@ -33,12 +33,13 @@ #ifndef LL_LLPANELPROFILEVIEW_H #define LL_LLPANELPROFILEVIEW_H -#include <llpanel.h> +#include "llpanel.h" +#include "llpanelprofile.h" +class LLPanelProfile; class LLPanelProfileTab; -class LLTabContainer; -class LLPanelProfileView : public LLPanel +class LLPanelProfileView : public LLPanelProfile { LOG_CLASS(LLPanelProfileView); friend class LLUICtrlFactory; @@ -48,22 +49,10 @@ public: ~LLPanelProfileView(void); - void onTabSelected(const LLSD& param); - void onOpen(const LLSD& key); BOOL postBuild(); - - void initTabs(const LLSD& key); - void onBackBtnClick(); - -private: - LLTabContainer* mTabContainer; - - typedef std::map<std::string, LLPanelProfileTab*> profile_tabs_t; - profile_tabs_t mTabs; - LLUUID mProfileId; }; #endif //LL_LLPANELPROFILEVIEW_H |