1 files changed, 18 insertions, 33 deletions

diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index 345935a091..428f4ce78d 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -61,6 +61,7 @@ class LLPanelProfileClassifieds;
 class LLPanelProfilePicks;
 class LLViewerFetchedTexture;
 
+
 /**
 * Panel for displaying Avatar's second life related info.
 */
@@ -76,11 +77,6 @@ public:
 	/*virtual*/ void onOpen(const LLSD& key);
 
 	/**
-	 * Saves changes.
-	 */
-	void apply(LLAvatarData* data);
-
-	/**
 	 * LLFriendObserver trigger
 	 */
 	virtual void changed(U32 mask);
@@ -190,7 +186,6 @@ private:
 	bool				mVoiceStatus;
     bool				mWaitingForImageUpload;
     std::string			mDescriptionText;
-    LLUUID mImageAssetId;
 
 	boost::signals2::connection	mAvatarNameCacheConnection;
 };
@@ -216,11 +211,6 @@ public:
 	void resetData();
 
 	/**
-	 * Saves changes.
-	 */
-	void apply(LLAvatarData* data);
-
-	/**
 	 * Loads web profile.
 	 */
 	/*virtual*/ void updateData();
@@ -265,25 +255,28 @@ public:
 
 	void resetData();
 
-	/**
-	 * Saves changes.
-	 */
-	void apply(LLAvatarData* data);
+    void setProfileImageUploading(bool loading);
+    void setProfileImageUploaded(const LLUUID &image_asset_id);
 
     friend void request_avatar_properties_coro(std::string cap_url, LLUUID agent_id);
 
 protected:
 	/*virtual*/ void updateButtons();
-	void onDescriptionFocusReceived();
+
+    void onChangePhoto();
+    void onRemovePhoto();
+    void setDescriptionText(const std::string &text);
+    void onSetDescriptionDirty();
+    void onSaveDescriptionChanges();
+    void onDiscardDescriptionChanges();
 
 	LLTextEditor*	mDescriptionEdit;
-    LLTextureCtrl*  mPicture;
+    LLIconCtrl*		mPicture;
     LLButton* mChangePhoto;
     LLButton* mRemovePhoto;
     LLButton* mSaveChanges;
     LLButton* mDiscardChanges;
 
-	bool			mIsEditing;
 	std::string		mCurrentDescription;
 };
 
@@ -316,13 +309,6 @@ public:
 
 	/*virtual*/ void updateData();
 
-	/**
-	 * Saves changes.
-	 */
-	virtual void apply();
-
-    void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name);
-
 protected:
 	/**
 	 * Fills rights data for friends.
@@ -334,6 +320,10 @@ protected:
 	void onCommitRights();
 	void onCommitNotes();
 	void enableCheckboxes(bool enable);
+    void setNotesText(const std::string &text);
+    void onSetNotesDirty();
+    void onSaveNotesChanges();
+    void onDiscardNotesChanges();
 
 	void applyRights();
 
@@ -341,10 +331,10 @@ protected:
 	LLCheckBoxCtrl*     mMapRights;
 	LLCheckBoxCtrl*     mEditObjectRights;
 	LLTextEditor*       mNotesEditor;
+    LLButton* mSaveChanges;
+    LLButton* mDiscardChanges;
 
-    std::string			mURLWebProfile;
-
-    boost::signals2::connection	mAvatarNameCacheConnection;
+    std::string		mCurrentNotes;
 };
 
 
@@ -366,11 +356,6 @@ public:
 
     /*virtual*/ void onOpen(const LLSD& key);
 
-    /**
-     * Saves changes.
-     */
-    void apply();
-
     void showPick(const LLUUID& pick_id = LLUUID::null);
     bool isPickTabSelected();
     bool isNotesTabSelected();