summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationhandlerutil.cpp
diff options
context:
space:
mode:
authorChuck Linden <chuck@lindenlab.com>2010-02-18 11:13:54 -0500
committerChuck Linden <chuck@lindenlab.com>2010-02-18 11:13:54 -0500
commit1ca9c1dcfef3a935be30a5322c91d5e3df523a98 (patch)
tree50aa5ccc5924d4296454dd3e8dcee7edddaf520b /indra/newview/llnotificationhandlerutil.cpp
parent1ae70e112a466a6ed5baf4e05c1771218c78b2f5 (diff)
parent9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (diff)
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/newview/llnotificationhandlerutil.cpp')
-rw-r--r--indra/newview/llnotificationhandlerutil.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index b8e0892b02..35569cffac 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -220,6 +220,7 @@ void LLHandlerUtil::logToNearbyChat(const LLNotificationPtr& notification, EChat
{
LLChat chat_msg(notification->getMessage());
chat_msg.mSourceType = type;
+ chat_msg.mFromName = SYSTEM_FROM;
nearby_chat->addMessage(chat_msg);
}
}