From 633865320aee0b2e1c615f2d5a772e5ddc3d9ae2 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 17 Oct 2023 12:01:03 +0200
Subject: [PATCH] SL-20163 Rename hide_sl_age to hide_age
---
indra/newview/llavatarpropertiesprocessor.cpp | 6 +++-
indra/newview/llavatarpropertiesprocessor.h | 4 +--
indra/newview/llpanelprofile.cpp | 32 +++++++++----------
indra/newview/llpanelprofile.h | 6 ++--
.../xui/en/panel_profile_secondlife.xml | 12 +++----
5 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp
index 1d08e158afb..f43ada7abcb 100644
--- a/indra/newview/llavatarpropertiesprocessor.cpp
+++ b/indra/newview/llavatarpropertiesprocessor.cpp
@@ -298,7 +298,10 @@ void LLAvatarPropertiesProcessor::requestAvatarPropertiesCoro(std::string cap_ur
|| !result.has("id")
|| agent_id != result["id"].asUUID())
{
- LL_WARNS("AvatarProperties") << "Failed to get agent information for id " << agent_id << LL_ENDL;
+ LL_WARNS("AvatarProperties") << "Failed to get agent information for id " << agent_id
+ << (!status ? " (no HTTP status)" : !result.has("id") ? " (no result.id)" :
+ std::string(" (result.id=") + result["id"].asUUID().asString() + ")")
+ << LL_ENDL;
LLAvatarPropertiesProcessor* self = getInstance();
self->removePendingRequest(agent_id, APT_PROPERTIES);
self->removePendingRequest(agent_id, APT_PICKS);
@@ -320,6 +323,7 @@ void LLAvatarPropertiesProcessor::requestAvatarPropertiesCoro(std::string cap_ur
avatar_data.about_text = result["sl_about_text"].asString();
avatar_data.fl_about_text = result["fl_about_text"].asString();
avatar_data.born_on = result["member_since"].asDate();
+ avatar_data.hide_age = result["hide_age"].asBoolean();
avatar_data.profile_url = getProfileURL(agent_id.asString());
avatar_data.flags = 0;
diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h
index c2347b9e350..0f8b1dd1309 100644
--- a/indra/newview/llavatarpropertiesprocessor.h
+++ b/indra/newview/llavatarpropertiesprocessor.h
@@ -85,8 +85,8 @@ struct LLAvatarData
std::string profile_url;
U8 caption_index;
std::string caption_text;
- std::string customer_type;
- bool hide_sl_age;
+ std::string customer_type;
+ bool hide_age;
U32 flags;
};
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 1d81586c159..6e4bf62dd99 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -191,7 +191,7 @@ void request_avatar_properties_coro(std::string cap_url, LLUUID agent_id)
avatar_data->caption_text = result["caption"].asString();
}
- avatar_data->hide_sl_age = result["hide_sl_age"].asBoolean();
+ avatar_data->hide_age = result["hide_age"].asBoolean();
panel = floater_profile->findChild<LLPanel>(PANEL_SECONDLIFE, TRUE);
LLPanelProfileSecondLife *panel_sl = dynamic_cast<LLPanelProfileSecondLife*>(panel);
@@ -859,7 +859,7 @@ LLPanelProfileSecondLife::LLPanelProfileSecondLife()
, mHasUnsavedDescriptionChanges(false)
, mWaitingForImageUpload(false)
, mAllowPublish(false)
- , mHideSLAge(false)
+ , mHideAge(false)
{
}
@@ -885,7 +885,7 @@ BOOL LLPanelProfileSecondLife::postBuild()
{
mGroupList = getChild<LLGroupList>("group_list");
mShowInSearchCombo = getChild<LLComboBox>("show_in_search");
- mHideSLAgeCombo = getChild<LLComboBox>("hide_sl_age");
+ mHideAgeCombo = getChild<LLComboBox>("hide_age");
mSecondLifePic = getChild<LLThumbnailCtrl>("2nd_life_pic");
mSecondLifePicLayout = getChild<LLPanel>("image_panel");
mDescriptionEdit = getChild<LLTextEditor>("sl_description_edit");
@@ -900,7 +900,7 @@ BOOL LLPanelProfileSecondLife::postBuild()
mCantEditObjectsIcon = getChild<LLIconCtrl>("cant_edit_objects");
mShowInSearchCombo->setCommitCallback([this](LLUICtrl*, void*) { onShowInSearchCallback(); }, nullptr);
- mHideSLAgeCombo->setCommitCallback([this](LLUICtrl*, void*) { onHideSLAgeCallback(); }, nullptr);
+ mHideAgeCombo->setCommitCallback([this](LLUICtrl*, void*) { onHideAgeCallback(); }, nullptr);
mGroupList->setDoubleClickCallback([this](LLUICtrl*, S32 x, S32 y, MASK mask) { LLPanelProfileSecondLife::openGroupProfile(); });
mGroupList->setReturnCallback([this](LLUICtrl*, const LLSD&) { LLPanelProfileSecondLife::openGroupProfile(); });
mSaveDescriptionChanges->setCommitCallback([this](LLUICtrl*, void*) { onSaveDescriptionChanges(); }, nullptr);
@@ -1339,14 +1339,14 @@ void LLPanelProfileSecondLife::fillAgeData(const LLAvatarData* avatar_data)
{
// Date from server comes already converted to stl timezone,
// so display it as an UTC + 0
- std::string name_and_date = getString(avatar_data->hide_sl_age ? "date_format_short" : "date_format_full");
+ std::string name_and_date = getString(avatar_data->hide_age ? "date_format_short" : "date_format_full");
LLSD args_name;
args_name["datetime"] = (S32)avatar_data->born_on.secondsSinceEpoch();
LLStringUtil::format(name_and_date, args_name);
getChild<LLUICtrl>("sl_birth_date")->setValue(name_and_date);
LLUICtrl* userAgeCtrl = getChild<LLUICtrl>("user_age");
- if (avatar_data->hide_sl_age)
+ if (avatar_data->hide_age)
{
userAgeCtrl->setVisible(FALSE);
}
@@ -1365,12 +1365,12 @@ void LLPanelProfileSecondLife::fillAgeData(const LLAvatarData* avatar_data)
F64 now = LLDate::now().secondsSinceEpoch();
if (now - birth > 365 * 24 * 60 * 60)
{
- mHideSLAge = avatar_data->hide_sl_age;
- mHideSLAgeCombo->setValue(mHideSLAge ? TRUE : FALSE);
+ mHideAge = avatar_data->hide_age;
+ mHideAgeCombo->setValue(mHideAge ? TRUE : FALSE);
}
else
{
- mHideSLAgeCombo->setVisible(FALSE);
+ mHideAgeCombo->setVisible(FALSE);
}
}
}
@@ -1489,9 +1489,9 @@ void LLPanelProfileSecondLife::setLoaded()
if (getSelfProfile())
{
mShowInSearchCombo->setEnabled(TRUE);
- if (mHideSLAgeCombo->getVisible())
+ if (mHideAgeCombo->getVisible())
{
- mHideSLAgeCombo->setEnabled(TRUE);
+ mHideAgeCombo->setEnabled(TRUE);
}
mDescriptionEdit->setEnabled(TRUE);
}
@@ -1828,14 +1828,14 @@ void LLPanelProfileSecondLife::onShowInSearchCallback()
saveAgentUserInfoCoro("allow_publish", value);
}
-void LLPanelProfileSecondLife::onHideSLAgeCallback()
+void LLPanelProfileSecondLife::onHideAgeCallback()
{
- bool value = mHideSLAgeCombo->getValue().asInteger();
- if (value == mHideSLAge)
+ bool value = mHideAgeCombo->getValue().asInteger();
+ if (value == mHideAge)
return;
- mHideSLAge = value;
- saveAgentUserInfoCoro("hide_sl_age", value);
+ mHideAge = value;
+ saveAgentUserInfoCoro("hide_age", value);
}
void LLPanelProfileSecondLife::onSaveDescriptionChanges()
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index 61ced27db52..f4b618eb271 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -179,7 +179,7 @@ class LLPanelProfileSecondLife
void setDescriptionText(const std::string &text);
void onSetDescriptionDirty();
void onShowInSearchCallback();
- void onHideSLAgeCallback();
+ void onHideAgeCallback();
void onSaveDescriptionChanges();
void onDiscardDescriptionChanges();
void onShowAgentPermissionsDialog();
@@ -194,7 +194,7 @@ class LLPanelProfileSecondLife
LLGroupList* mGroupList;
LLComboBox* mShowInSearchCombo;
- LLComboBox* mHideSLAgeCombo;
+ LLComboBox* mHideAgeCombo;
LLThumbnailCtrl* mSecondLifePic;
LLPanel* mSecondLifePicLayout;
LLTextEditor* mDescriptionEdit;
@@ -216,7 +216,7 @@ class LLPanelProfileSecondLife
bool mVoiceStatus;
bool mWaitingForImageUpload;
bool mAllowPublish;
- bool mHideSLAge;
+ bool mHideAge;
std::string mDescriptionText;
LLUUID mImageId;
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 26cc04e6af6..307b7b83efa 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -352,7 +352,7 @@ Account: [ACCTTYPE]
name="settings_panel"
follows="all"
layout="topleft"
- height="80"
+ height="70"
auto_resize="false"
user_resize="false">
<!-- only for self -->
@@ -360,8 +360,8 @@ Account: [ACCTTYPE]
name="show_in_search"
tool_tip="Let people see you in search results"
left="1"
- top="18"
- height="23"
+ top="5"
+ height="25"
width="176"
follows="left|top"
layout="topleft"
@@ -376,11 +376,11 @@ Account: [ACCTTYPE]
value="0" />
</combo_box>
<combo_box
- name="hide_sl_age"
+ name="hide_age"
tool_tip="Let people see your SL age"
left="1"
- top="48"
- height="23"
+ top="40"
+ height="25"
width="176"
follows="left|top"
layout="topleft"
--
GitLab