diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-14 20:37:03 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-14 20:37:03 +0000 |
| commit | b5ffeaff1ab53008a8f1ee72cd1f398bd1ff21c2 (patch) | |
| tree | e12431a5c6945b2ece16765bcdb04c241c4d9a96 /indra/newview/llcallingcard.cpp | |
| parent | 7475ec05fc81e358a6979f3e9d7050ab91511c57 (diff) | |
merge -r 2014-2032 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
* Bugs: EXT-1005 EXT-1488 EXT-320 EXT-1236 EXT-1236 EXT-1002 EXT-1030
* New Dev: EXT-1293 EXT-1416
Diffstat (limited to 'indra/newview/llcallingcard.cpp')
| -rw-r--r-- | indra/newview/llcallingcard.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index e3440ee779..2b7bd83ca3 100644 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -682,7 +682,11 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online) { std::string notifyMsg = notification->getMessage(); if (!notifyMsg.empty()) + { floater->addHistoryLine(notifyMsg,LLUIColorTable::instance().getColor("SystemChatColor")); + + LLIMModel::getInstance()->addMessage(session_id, SYSTEM_FROM, LLUUID::null, notifyMsg); + } } } |