summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llpanelme.cpp14
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml8
2 files changed, 19 insertions, 3 deletions
diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
index c1d02fae39..544ca47da4 100644
--- a/indra/newview/llpanelme.cpp
+++ b/indra/newview/llpanelme.cpp
@@ -347,12 +347,22 @@ void LLPanelMyProfileEdit::onCacheSetName(bool success,
void LLPanelMyProfileEdit::onDialogSetName(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
- if (option == 0)
+ if (option == 0 || option == 1)
{
LLUUID agent_id = notification["payload"]["agent_id"];
if (agent_id.isNull()) return;
- std::string display_name_utf8 = response["display_name"].asString();
+ std::string display_name_utf8;
+ if (option == 0)
+ {
+ // user gave us a name
+ display_name_utf8 = response["display_name"].asString();
+ }
+ else
+ {
+ // reset back to People API default
+ display_name_utf8 = "";
+ }
const U32 DISPLAY_NAME_MAX_LENGTH = 31; // characters, not bytes
LLWString display_name_wstr = utf8string_to_wstring(display_name_utf8);
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index cc32941633..51b88cf59a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3145,7 +3145,9 @@ You are no longer frozen.
icon="alertmodal.tga"
name="SetDisplayName"
type="alertmodal">
-Change your display name?
+Change your display name (used for name tags, chat, etc.)?
+
+You can also reset it back to your original username.
<form name="form">
<input name="display_name" type="text">
[DISPLAY_NAME]
@@ -3157,6 +3159,10 @@ Change your display name?
text="Change"/>
<button
index="1"
+ name="Reset"
+ text="Reset"/>
+ <button
+ index="2"
name="Cancel"
text="Cancel"/>
</form>