diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-12 01:12:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-12 01:12:27 +0000 |
| commit | 0bf4b5f2222ffb8171be094613363427f3b8470a (patch) | |
| tree | 4b742d6815f44a85c98113e9c5a3017eafc5968d /indra/newview/llpanelprofile.h | |
| parent | 8d7e56f219d0915e2c4a19baf2809dbc6ede7fa5 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring
Diffstat (limited to 'indra/newview/llpanelprofile.h')
| -rw-r--r-- | indra/newview/llpanelprofile.h | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h index 2f6d53a859..b55963ec4a 100644 --- a/indra/newview/llpanelprofile.h +++ b/indra/newview/llpanelprofile.h @@ -39,34 +39,42 @@ class LLTabContainer; +/** +* Base class for Profile View and Me Profile. +*/ class LLPanelProfile : public LLPanel { LOG_CLASS(LLPanelProfile); public: - virtual BOOL postBuild(); + /*virtual*/ BOOL postBuild(); - virtual void onOpen(const LLSD& key) {}; + /*virtual*/ void onOpen(const LLSD& key); virtual void togglePanel(LLPanel*); protected: + LLPanelProfile(); - ~LLPanelProfile(); - void onTabSelected(const LLSD& param); + virtual void onTabSelected(const LLSD& param); + + virtual void setAllChildrenVisible(BOOL visible); + + LLTabContainer* getTabCtrl() { return mTabCtrl; } - void setAllChildrenVisible(BOOL visible); + const LLUUID& getAvatarId() { return mAvatarId; } + void setAvatarId(const LLUUID& avatar_id) { mAvatarId = avatar_id; } - LLTabContainer* mTabContainer; - typedef std::map<std::string, LLPanelProfileTab*> profile_tabs_t; - profile_tabs_t mTabs; + profile_tabs_t& getTabContainer() { return mTabContainer; } + +private: + LLTabContainer* mTabCtrl; + profile_tabs_t mTabContainer; LLUUID mAvatarId; }; - - #endif //LL_LLPANELPROFILE_H |