diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llpanelprofileview.h | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
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 |