SL-17532 Ability to pick inventory image as a profile image

1 files changed, 10 insertions, 1 deletions

diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index 943048843f..b363bd3fd2 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -181,6 +181,8 @@ private:
     void onDiscardDescriptionChanges();
     void onShowAgentPermissionsDialog();
     void onShowAgentProfileTexture();
+    void onShowTexturePicker();
+    void onCommitProfileImage(const LLUUID& id);
     void onOpenNotes();
 
 private:
@@ -205,6 +207,7 @@ private:
 
     LLHandle<LLFloater>	mFloaterPermissionsHandle;
     LLHandle<LLFloater>	mFloaterProfileTextureHandle;
+    LLHandle<LLFloater>	mFloaterTexturePickerHandle;
 
     bool				mHasUnsavedDescriptionChanges;
 	bool				mVoiceStatus;
@@ -288,8 +291,10 @@ public:
 protected:
 	void setLoaded() override;
 
+    void onUploadPhoto();
     void onChangePhoto();
     void onRemovePhoto();
+    void onCommitPhoto(const LLUUID& id);
     void setDescriptionText(const std::string &text);
     void onSetDescriptionDirty();
     void onSaveDescriptionChanges();
@@ -297,12 +302,16 @@ protected:
 
 	LLTextEditor*	mDescriptionEdit;
     LLIconCtrl*		mPicture;
+    LLButton* mUploadPhoto;
     LLButton* mChangePhoto;
     LLButton* mRemovePhoto;
     LLButton* mSaveChanges;
     LLButton* mDiscardChanges;
 
-	std::string		mCurrentDescription;
+    LLHandle<LLFloater>	mFloaterTexturePickerHandle;
+
+    std::string		mCurrentDescription;
+    LLUUID			mImageId;
     bool			mHasUnsavedChanges;
 };