livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-15312 Header fixes 

fixed 'remove_proto' being active even if there is no photo.
master
Andrey Kleshchev 2022-06-06 18:22:57 +03:00
parent c88e30736b
commit c4aa8b1636
7 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterclassified.cpp
View File

@ -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

2
indra/newview/llfloaterclassified.h
View File

@ -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

8
indra/newview/llpanelprofile.cpp
View File

@ -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;

1
indra/newview/llpanelprofile.h
View File

@ -209,6 +209,7 @@ private:
bool mWaitingForImageUpload;
bool mAllowPublish;
std::string mDescriptionText;
LLUUID mImageId;
boost::signals2::connection mAvatarNameCacheConnection;
};

2
indra/newview/skins/default/xui/en/floater_profile.xml
View File

@ -31,7 +31,7 @@
follows="all"
layout="topleft"
halign="center"
tab_min_width="70"
tab_min_width="81"
tab_height="30"
tab_position="top"
>

2
indra/newview/skins/default/xui/en/floater_profile_permissions.xml
View File

@ -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"

2
indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
View File

@ -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"