7 files changed, 13 insertions, 6 deletions
diff --git a/indra/newview/llfloaterclassified.cpp b/indra/newview/llfloaterclassified.cpp
index 58b81153a4..3520b0f67a 100644
--- a/indra/newview/llfloaterclassified.cpp
+++ b/indra/newview/llfloaterclassified.cpp
@@ -1,6 +1,6 @@
 /**
  * @file llfloaterclassified.cpp
- * @brief Avatar profile floater.
+ * @brief LLFloaterClassified for displaying classifieds.
  *
  * $LicenseInfo:firstyear=2022&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/llfloaterclassified.h b/indra/newview/llfloaterclassified.h
index e02dca29d5..2c95d82b2c 100644
--- a/indra/newview/llfloaterclassified.h
+++ b/indra/newview/llfloaterclassified.h
@@ -1,6 +1,6 @@
 /**
  * @file llfloaterclassified.h
- * @brief Avatar profile floater.
+ * @brief LLFloaterClassified for displaying classifieds.
  *
  * $LicenseInfo:firstyear=2022&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 8db9658837..1542c425ce 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -967,6 +967,8 @@ void LLPanelProfileSecondLife::resetData()
 
     // Set default image and 1:1 dimensions for it
     mSecondLifePic->setValue("Generic_Person_Large");
+    mImageId = LLUUID::null;
+
     LLRect imageRect = mSecondLifePicLayout->getRect();
     mSecondLifePicLayout->reshape(imageRect.getHeight(), imageRect.getHeight());
 
@@ -1055,6 +1057,7 @@ void LLPanelProfileSecondLife::setProfileImageUploading(bool loading)
 void LLPanelProfileSecondLife::setProfileImageUploaded(const LLUUID &image_asset_id)
 {
     mSecondLifePic->setValue(image_asset_id);
+    mImageId = image_asset_id;
 
     LLViewerFetchedTexture* imagep = LLViewerTextureManager::getFetchedTexture(image_asset_id);
     if (imagep->getFullHeight())
@@ -1120,10 +1123,12 @@ void LLPanelProfileSecondLife::fillCommonData(const LLAvatarData* avatar_data)
     if (avatar_data->image_id.notNull())
     {
         mSecondLifePic->setValue(avatar_data->image_id);
+        mImageId = avatar_data->image_id;
     }
     else
     {
         mSecondLifePic->setValue("Generic_Person_Large");
+        mImageId = LLUUID::null;
     }
 
     // Will be loaded as a LLViewerFetchedTexture::BOOST_UI due to mSecondLifePic
@@ -1523,6 +1528,7 @@ void LLPanelProfileSecondLife::onCommitMenu(const LLSD& userdata)
                 boost::bind(put_avatar_properties_coro, cap_url, getAvatarId(), params));
 
             mSecondLifePic->setValue("Generic_Person_Large");
+            mImageId = LLUUID::null;
         }
         else
         {
@@ -1581,7 +1587,7 @@ bool LLPanelProfileSecondLife::onEnableMenu(const LLSD& userdata)
     else if (item_name == "remove_photo")
     {
         std::string cap_url = gAgent.getRegionCapability(PROFILE_PROPERTIES_CAP);
-        return !cap_url.empty() && !mWaitingForImageUpload;
+        return mImageId.notNull() && !cap_url.empty() && !mWaitingForImageUpload;
     }
 
     return false;
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index 19ce92a2d4..549e84b1fa 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -209,6 +209,7 @@ private:
     bool				mWaitingForImageUpload;
     bool				mAllowPublish;
     std::string			mDescriptionText;
+    LLUUID				mImageId;
 
 	boost::signals2::connection	mAvatarNameCacheConnection;
 };
diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
index 61347c7348..32ab811a6e 100644
--- a/indra/newview/skins/default/xui/en/floater_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -31,7 +31,7 @@
          follows="all"
          layout="topleft"
          halign="center"
-         tab_min_width="70"
+         tab_min_width="81"
          tab_height="30"
          tab_position="top"
         >
diff --git a/indra/newview/skins/default/xui/en/floater_profile_permissions.xml b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
index 62cf9b3272..9f3b4d9a00 100644
--- a/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
@@ -9,7 +9,7 @@
  bg_alpha_image="Window_NoTitle_Background"
  height="115"
  layout="topleft"
- name="profile_permissiona"
+ name="profile_permissions"
  width="300">
   <string
    name="description_string"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index aa40f29e5d..0a74d934ac 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -497,7 +497,7 @@ Account: [ACCTTYPE]
      user_resize="false">
       <text
        name="group_label"
-       value="Group membership"
+       value="Group memberships"
        top="1"
        left="1"
        right="-1"