summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplayname.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewerdisplayname.cpp')
-rw-r--r--indra/newview/llviewerdisplayname.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llviewerdisplayname.cpp b/indra/newview/llviewerdisplayname.cpp
index 4122a112e5..bec2687cca 100644
--- a/indra/newview/llviewerdisplayname.cpp
+++ b/indra/newview/llviewerdisplayname.cpp
@@ -180,11 +180,16 @@ class LLDisplayNameUpdate : public LLHTTPNode
// force name tag to update
LLVOAvatar::invalidateNameTag(agent_id);
- LLSD args;
- args["OLD_NAME"] = old_display_name;
- args["SLID"] = av_name.mSLID;
- args["NEW_NAME"] = av_name.mDisplayName;
- LLNotificationsUtil::add("DisplayNameUpdate", args);
+ // Don't show a notification for my name, because we'll show a nicer
+ // dialog
+ if (agent_id != gAgent.getID())
+ {
+ LLSD args;
+ args["OLD_NAME"] = old_display_name;
+ args["SLID"] = av_name.mSLID;
+ args["NEW_NAME"] = av_name.mDisplayName;
+ LLNotificationsUtil::add("DisplayNameUpdate", args);
+ }
}
};