SL-17624 In profiles 'Remove Photo' remains inactive after uploading a photo

1 files changed, 2 insertions, 0 deletions

diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index dbb83b0da2..559e6abfdb 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -2141,6 +2141,7 @@ void LLPanelProfileFirstLife::setProfileImageUploading(bool loading)
 void LLPanelProfileFirstLife::setProfileImageUploaded(const LLUUID &image_asset_id)
 {
     mPicture->setValue(image_asset_id);
+    mImageId = image_asset_id;
     setProfileImageUploading(false);
 }
 
@@ -2323,6 +2324,7 @@ void LLPanelProfileFirstLife::resetData()
 {
     mDescriptionEdit->setValue(LLStringUtil::null);
     mPicture->setValue("Generic_Person_Large");
+    mImageId = LLUUID::null;
 
     mUploadPhoto->setVisible(getSelfProfile());
     mChangePhoto->setVisible(getSelfProfile());