1 files changed, 56 insertions, 45 deletions

diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index 81cfe02..3e8bffd 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -59,35 +59,61 @@ enum EOnlineStatus
         ONLINE_STATUS_YES     = 1
 };
 
-class LLPanelAvatarFirstLife
-: public LLPanel
+// Base class for all sub-tabs inside the avatar profile.  Many of these
+// panels need to keep track of the parent panel (to get the avatar id)
+// and only request data from the database when they are first drawn. JC
+class LLPanelAvatarTab : public LLPanel
 {
 public:
-        LLPanelAvatarFirstLife(const std::string& name, const LLRect &rect, LLPanelAvatar* panel_avatar);
-        /*virtual*/ ~LLPanelAvatarFirstLife();
-        /*virtual*/ BOOL        postBuild(void);
+        LLPanelAvatarTab(const std::string& name, const LLRect &rect, 
+                LLPanelAvatar* panel_avatar);
 
-        void enableControls(BOOL own_avatar);
+        // Calls refresh() once per frame when panel is visible
+        /*virtual*/ void draw();
 
-protected:
+        LLPanelAvatar* getPanelAvatar() const { return mPanelAvatar; }
+
+        void setDataRequested(bool requested) { mDataRequested = requested; }
+        bool isDataRequested() const              { return mDataRequested; }
+
+        // If the data for this tab has not yet been requested,
+        // send the request.  Used by tabs that are filled in only
+        // when they are first displayed.
+        // type is one of "notes", "classifieds", "picks"
+        void sendAvatarProfileRequestIfNeeded(const char* type);
+
+private:
         LLPanelAvatar* mPanelAvatar;
+        bool mDataRequested;
+};
+
+
+class LLPanelAvatarFirstLife : public LLPanelAvatarTab
+{
+public:
+        LLPanelAvatarFirstLife(const std::string& name, const LLRect &rect, LLPanelAvatar* panel_avatar);
+
+        /*virtual*/ BOOL postBuild(void);
+
+        void enableControls(BOOL own_avatar);
 };
 
 
 class LLPanelAvatarSecondLife
-: public LLPanel
+: public LLPanelAvatarTab
 {
 public:
         LLPanelAvatarSecondLife(const std::string& name, const LLRect &rect, LLPanelAvatar* panel_avatar );
-        /*virtual*/ ~LLPanelAvatarSecondLife();
 
-        /*virtual*/ BOOL        postBuild(void);
-        /*virtual*/ void draw();
+        /*virtual*/ BOOL postBuild(void);
+        /*virtual*/ void refresh();
 
         static void onClickImage(                       void *userdata);
         static void onClickFriends(                     void *userdata);
         static void onDoubleClickGroup(void* userdata);
         static void onClickPublishHelp(void *userdata);
+        static void onClickPartnerHelp(void *userdata);
+        static void onClickPartnerHelpLoadURL(S32 option, void* userdata);
 
         // Clear out the controls anticipating new network data.
         void clearControls();
@@ -97,15 +123,14 @@ public:
 
         void setPartnerID(LLUUID id) { mPartnerID = id; }
         
-protected:
-        LLPanelAvatar* mPanelAvatar;
-
+private:
         LLUUID                          mPartnerID;
 };
 
+
 // WARNING!  The order of the inheritance here matters!!  Do not change.  - KLW
 class LLPanelAvatarWeb : 
-        public LLPanel
+        public LLPanelAvatarTab
 #if LL_LIBXUL_ENABLED
         , public LLWebBrowserCtrlObserver
 #endif
@@ -132,17 +157,17 @@ public:
         virtual void onLocationChange( const EventType& eventIn );
 #endif
 
-protected:
-        LLPanelAvatar*          mPanelAvatar;
+private:
         std::string                     mURL;
         LLWebBrowserCtrl*       mWebBrowser;
 };
 
-class LLPanelAvatarAdvanced : public LLPanel
+
+class LLPanelAvatarAdvanced : public LLPanelAvatarTab
 {
 public:
         LLPanelAvatarAdvanced(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
-        /*virtual*/ ~LLPanelAvatarAdvanced();
+
         /*virtual*/ BOOL        postBuild(void);
 
         void enableControls(BOOL own_avatar);
@@ -153,8 +178,7 @@ public:
                                            U32* skills_mask, std::string& skills_text,
                                            std::string& languages_text);
 
-protected:
-        LLPanelAvatar*          mPanelAvatar;
+private:
         S32                                     mWantToCount;
         S32                                     mSkillsCount;
         LLCheckBoxCtrl          *mWantToCheck[8];
@@ -164,35 +188,31 @@ protected:
 };
 
 
-class LLPanelAvatarNotes : public LLPanel
+class LLPanelAvatarNotes : public LLPanelAvatarTab
 {
 public:
         LLPanelAvatarNotes(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
-        /*virtual*/ ~LLPanelAvatarNotes();
+
         /*virtual*/ BOOL        postBuild(void);
 
-        void enableControls(BOOL own_avatar);
+        /*virtual*/ void refresh();
 
-        static void onCommitNotes(LLUICtrl* field, void* userdata);
+        void clearControls();
 
-protected:
-        LLPanelAvatar* mPanelAvatar;
+        static void onCommitNotes(LLUICtrl* field, void* userdata);
 };
 
 
-class LLPanelAvatarClassified : public LLPanel
+class LLPanelAvatarClassified : public LLPanelAvatarTab
 {
 public:
         LLPanelAvatarClassified(const LLString& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
-        /*virtual*/ ~LLPanelAvatarClassified();
 
-        /*virtual*/ BOOL        postBuild(void);
-        /*virtual*/ void draw();
+        /*virtual*/ BOOL postBuild(void);
 
-        void refresh();
+        /*virtual*/ void refresh();
 
         void apply();
-        void enableControls(BOOL own_avatar);
 
         BOOL titleIsValid();
 
@@ -209,23 +229,17 @@ private:
 
         static void callbackDelete(S32 option, void* data);
         static void callbackNew(S32 option, void* data);
-
-private:
-        LLPanelAvatar* mPanelAvatar;
 };
 
-class LLPanelAvatarPicks : public LLPanel
+
+class LLPanelAvatarPicks : public LLPanelAvatarTab
 {
 public:
         LLPanelAvatarPicks(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
-        /*virtual*/ ~LLPanelAvatarPicks();
 
         /*virtual*/ BOOL        postBuild(void);
-        /*virtual*/ void draw();
-
-        void refresh();
 
-        void enableControls(BOOL own_avatar);
+        /*virtual*/ void refresh();
 
         // Delete all the pick sub-panels from the tab container
         void deletePickPanels();
@@ -240,9 +254,6 @@ private:
         static void onClickDelete(void* data);
 
         static void callbackDelete(S32 option, void* data);
-
-private:
-        LLPanelAvatar* mPanelAvatar;
 };