summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-04-13 10:47:58 -0700
committerJames Cook <james@lindenlab.com>2010-04-13 10:47:58 -0700
commit60396971ca3e627fc4980a726f7d375bc570a2d2 (patch)
treeb5e57c99ca781d3ffd2dcb5c37869406c79e42d8 /indra/newview
parent1a7740f0143b7368cd24f44360fea37dcd23bad2 (diff)
DEV-47529 Chat "foo changed name to bar" on name change, viewer piece
Reviewed with Kelly
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerdisplayname.cpp13
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml7
2 files changed, 17 insertions, 3 deletions
diff --git a/indra/newview/llviewerdisplayname.cpp b/indra/newview/llviewerdisplayname.cpp
index 84697f93b6..9739c7fbc1 100644
--- a/indra/newview/llviewerdisplayname.cpp
+++ b/indra/newview/llviewerdisplayname.cpp
@@ -42,6 +42,7 @@
#include "llavatarnamecache.h"
#include "llhttpclient.h"
#include "llhttpnode.h"
+#include "llnotificationsutil.h"
namespace LLViewerDisplayName
{
@@ -124,15 +125,21 @@ class LLDisplayNameUpdate : public LLHTTPNode
{
LLSD body = input["body"];
LLUUID agent_id = body["agent_id"];
-
- llinfos << "JAMESDEBUG LLDisplayNameUpdate agent_id "
- << agent_id << llendl;
+ std::string slid = body["sl_id"];
+ std::string old_display_name = body["old_display_name"];
+ std::string new_display_name = body["new_display_name"];
// force re-request of this agent's name data
LLAvatarNameCache::erase(agent_id);
// force name tag to update
LLVOAvatar::invalidateNameTag(agent_id);
+
+ LLSD args;
+ args["OLD_NAME"] = old_display_name;
+ args["SLID"] = slid;
+ args["NEW_NAME"] = new_display_name;
+ LLNotificationsUtil::add("DisplayNameUpdate", args);
}
};
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0e14b06407..e57b21b05c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3075,6 +3075,13 @@ Change your display name?
</notification>
<notification
+ icon="notifytip.tga"
+ name="DisplayNameUpdate"
+ type="notifytip">
+ [OLD_NAME] ([SLID]) is now known as [NEW_NAME].
+ </notification>
+
+ <notification
icon="alertmodal.tga"
name="OfferTeleport"
type="alertmodal">