From dbe56047e24311c25fd37ced3957ab77cb1cffc2 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 12 Dec 2023 18:19:22 +0100 Subject: [PATCH] FIRE-33330: Can't reset display name within the first week; also show lock out date in SLT properly --- indra/newview/llfloaterdisplayname.cpp | 56 ++++++++++++------- .../default/xui/de/floater_display_name.xml | 6 +- .../default/xui/en/floater_display_name.xml | 28 ++++++---- 3 files changed, 57 insertions(+), 33 deletions(-) diff --git a/indra/newview/llfloaterdisplayname.cpp b/indra/newview/llfloaterdisplayname.cpp index ad2533debc..9b389a10f4 100644 --- a/indra/newview/llfloaterdisplayname.cpp +++ b/indra/newview/llfloaterdisplayname.cpp @@ -76,12 +76,16 @@ void LLFloaterDisplayName::onOpen(const LLSD& key) if (now_secs < av_name.mNextUpdate) { // ...can't update until some time in the future - F64 next_update_local_secs = - av_name.mNextUpdate - LLStringOps::getLocalTimeOffset(); - LLDate next_update_local(next_update_local_secs); - // display as "July 18 12:17 PM" - std::string next_update_string = - next_update_local.toHTTPDateString("%B %d %I:%M %p"); + // Display lock out date in SLT + //F64 next_update_local_secs = + // av_name.mNextUpdate - LLStringOps::getLocalTimeOffset(); + //LLDate next_update_local(next_update_local_secs); + //// display as "July 18 12:17 PM" + //std::string next_update_string = + //next_update_local.toHTTPDateString("%B %d %I:%M %p"); + std::string next_update_string = getString("LockOutDateFormat"); + LLStringUtil::format(next_update_string, LLSD().with("datetime", (S32)av_name.mNextUpdate)); + // getChild("lockout_text")->setTextArg("[TIME]", next_update_string); getChild("lockout_text")->setVisible(true); getChild("save_btn")->setEnabled(false); @@ -160,26 +164,38 @@ void LLFloaterDisplayName::onCancel() void LLFloaterDisplayName::onReset() { - LLAvatarName av_name; - if (!LLAvatarNameCache::get(gAgent.getID(), &av_name)) - { - return; - } - getChild("display_name_editor")->setValue(av_name.getUserName()); + // FIRE-33330: Can't reset display name within the first week + //LLAvatarName av_name; + //if (!LLAvatarNameCache::get(gAgent.getID(), &av_name)) + //{ + // return; + //} + //getChild("display_name_editor")->setValue(av_name.getUserName()); - if (getChild("display_name_editor")->getEnabled()) + //if (getChild("display_name_editor")->getEnabled()) + //{ + // // UI is enabled, fill the first field + // getChild("display_name_confirm")->clear(); + // getChild("display_name_confirm")->setFocus(TRUE); + //} + //else + //{ + // // UI is disabled, looks like we should allow resetting + // // even if user already set a display name, enable save button + // getChild("display_name_confirm")->setValue(av_name.getUserName()); + // getChild("save_btn")->setEnabled(true); + //} + if (LLAvatarNameCache::getInstance()->hasNameLookupURL()) { - // UI is enabled, fill the first field - getChild("display_name_confirm")->clear(); - getChild("display_name_confirm")->setFocus(TRUE); + LLViewerDisplayName::set("", boost::bind(&LLFloaterDisplayName::onCacheSetName, this, _1, _2, _3)); } else { - // UI is disabled, looks like we should allow resetting - // even if user already set a display name, enable save button - getChild("display_name_confirm")->setValue(av_name.getUserName()); - getChild("save_btn")->setEnabled(true); + LLNotificationsUtil::add("SetDisplayNameFailedGeneric"); } + + setVisible(false); + // } diff --git a/indra/newview/skins/default/xui/de/floater_display_name.xml b/indra/newview/skins/default/xui/de/floater_display_name.xml index 46459fccbd..d4708415fb 100644 --- a/indra/newview/skins/default/xui/de/floater_display_name.xml +++ b/indra/newview/skins/default/xui/de/floater_display_name.xml @@ -1,10 +1,14 @@ + + [day,datetime,slt]. [month,datetime,slt] [year,datetime,slt], [hour24,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt] + Der Anzeigename ist der Name, den Sie Ihrem Avatar geben. Sie können ihn einmal pro Woche ändern. - Früheste Änderung möglich ab: [TIME]. + Früheste Änderung möglich ab: +[TIME]. Neuer Anzeigename: diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml index 7fb5827e9b..74eda316d4 100644 --- a/indra/newview/skins/default/xui/en/floater_display_name.xml +++ b/indra/newview/skins/default/xui/en/floater_display_name.xml @@ -10,6 +10,9 @@ save_rect="false" title="Change Display Name" width="445"> + + [month,datetime,slt] [day,datetime,slt] [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [timezone,datetime,slt] + Your display name is what other people see above your head. It is different from your login name. You can change it once a week. @@ -30,20 +33,21 @@ length="1" follows="left|top" font="SansSerif" - height="20" + height="30" layout="topleft" - left="25" + left="15" text_color="EmphasisColor" name="lockout_text" - top="65" + top="55" use_ellipses="true" - visible="false" - width="410" + visible="true" + right="-10" wrap="true"> - You cannot change your Display Name until: [TIME]. + You cannot change your Display Name until: +[TIME]. @@ -88,7 +92,7 @@ label="Save" layout="topleft" font="SansSerif" - left_pad="35" + left_pad="50" name="save_btn" tool_tip="Save your new Display Name" top_delta="0"