diff options
author | Richard Linden <none@none> | 2011-10-15 18:14:23 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-10-15 18:14:23 -0700 |
commit | 62d9db2f21b2a6fb579e8f7631a4e387cc5e5b29 (patch) | |
tree | 54587047f6f27d3a1b58a23a1a532a4436e61f65 /indra/newview/llpanelprofile.h | |
parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
parent | fc2bd1cce2e6c213fa682b9768d435a4e394a95e (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llpanelprofile.h')
-rwxr-xr-x | indra/newview/llpanelprofile.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h index fca359f51e..bd4457c240 100755 --- a/indra/newview/llpanelprofile.h +++ b/indra/newview/llpanelprofile.h @@ -46,8 +46,6 @@ public: /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); /*virtual*/ void onOpen(const LLSD& key); - virtual void togglePanel(LLPanel*, const LLSD& key = LLSD()); - virtual void openPanel(LLPanel* panel, const LLSD& params); virtual void closePanel(LLPanel* panel); @@ -60,8 +58,6 @@ protected: virtual void onTabSelected(const LLSD& param); - LLTabContainer* getTabCtrl() { return mTabCtrl; } - const LLUUID& getAvatarId() { return mAvatarId; } void setAvatarId(const LLUUID& avatar_id) { mAvatarId = avatar_id; } @@ -97,7 +93,6 @@ private: }; //-- ChildStack ends ------------------------------------------------------ - LLTabContainer* mTabCtrl; profile_tabs_t mTabContainer; ChildStack mChildStack; LLUUID mAvatarId; |