From 4835c615d5a00f146bcd5c7a50153418ce2a3613 Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 1 Jun 2010 16:09:58 -0700 Subject: DEV-50778 Update text for display name change in viewer Reviewed with Erica - got them as close as we can with the data we have available. --- indra/newview/llpanelme.cpp | 4 +++- indra/newview/skins/default/xui/en/notifications.xml | 20 ++++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp index cd0cbe8128..0fc2a78bcd 100644 --- a/indra/newview/llpanelme.cpp +++ b/indra/newview/llpanelme.cpp @@ -298,7 +298,9 @@ void LLPanelMyProfileEdit::onCacheSetName(bool success, { // Inform the user that the change took place, but will take a while // to percolate. - LLNotificationsUtil::add("SetDisplayNameSuccess"); + LLSD args; + args["DISPLAY_NAME"] = content["display_name"]; + LLNotificationsUtil::add("SetDisplayNameSuccess", args); // Re-fetch my name, as it may have been sanitized by the service LLAvatarNameCache::get(getAvatarId(), diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 50e839ad17..c7eb90dbff 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3130,10 +3130,10 @@ You are no longer frozen. -Your new display name will be used for name tags, chat, friends lists, etc. You can also reset it back to your original username. There will be a delay before you can change your display name again, so choose wisely. + type="alert"> +The name above your avatar's head is called a [http://wiki.secondlife.com/wiki/Setting_your_display_name display name]. You can change it periodically. -See http://wiki.secondlife.com/wiki/Setting_your_display_name +Press reset to make it the same as your username. Change your display name?
@@ -3159,22 +3159,18 @@ Change your display name? -Thanks for updating your name! - -Just like in real life, it takes a while for everyone to learn about a new name. Please allow several days for your name to update in object ownership, scripts, search, etc. + type="alert"> +Hi [DISPLAY_NAME]! -See http://wiki.secondlife.com/wiki/Setting_your_display_name +Just like in real life, it takes a while for everyone to learn about a new name. Please allow several days for [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] in objects, scripts, search, etc. -Sorry, you cannot change your display name until: + type="alert"> +Sorry, you cannot [http://wiki.secondlife.com/wiki/Setting_your_display_name change your display name] until: [TIME] - -See http://wiki.secondlife.com/wiki/Setting_your_display_name