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

DEV-50013 Add "Reset" button to Set Name dialog 

Reviewed with Richard
master
James Cook 2010-05-24 16:58:49 -07:00
parent 01fa137993
commit 3b0bb81596
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llpanelme.cpp
View File

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

8
indra/newview/skins/default/xui/en/notifications.xml
View File

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