diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
commit | 39905b927d60e204438705728d2c214cb3f9ef81 (patch) | |
tree | 7bb617cc204514b233e081457d905693aa0ae409 /indra/newview/llpanelavatar.h | |
parent | 687cff0eb8dfe663b99e18cfd953e0764d8ab372 (diff) |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4
Diffstat (limited to 'indra/newview/llpanelavatar.h')
-rw-r--r-- | indra/newview/llpanelavatar.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h index f72eb1990d..8bfa386d55 100644 --- a/indra/newview/llpanelavatar.h +++ b/indra/newview/llpanelavatar.h @@ -109,6 +109,9 @@ protected: virtual ~LLPanelProfileTab(); void setProfileType(); +private: + void scrollToTop(); + protected: e_profile_type mProfileType; LLUUID mAvatarId; @@ -133,7 +136,7 @@ public: virtual void clearControls(); /*virtual*/ BOOL postBuild(void); - void onOpen(const LLSD& key); + /*virtual*/ void onOpen(const LLSD& key); void onAddFriendButtonClick(); @@ -152,8 +155,12 @@ private: void onStatusChanged(); void onStatusMessageChanged(); void setCaptionText(const LLAvatarData* avatar_data); - void scrollToTop(); + static void onUrlTextboxClicked(std::string url); + void onHomepageTextboxClicked(); + void onUpdateAccountTextboxClicked(); + void onMyAccountTextboxClicked(); + void onPartnerEditTextboxClicked(); protected: bool mEditMode; @@ -175,6 +182,8 @@ public: static void* create(void* data); + void onActivate(const LLUUID& id); + BOOL postBuild(void); void onCommitRights(); @@ -188,6 +197,8 @@ public: void updateData(); protected: + + void updateChildrenList(); }; |