diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-26 09:50:56 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-26 09:50:56 +0000 |
| commit | 044e020bcb7e1dd94f689ba6977bcb07a87d8a35 (patch) | |
| tree | cf549fa816d92f90fc5de775cba08d91d30874be /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | 9f079954af9ca80498bf6953d65cc7e77e956f26 (diff) | |
| parent | 92facf86d6bf1a7acecdc6e536ac2ad7bcdfdd96 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index e164aa8fc4..81edb55f93 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -144,6 +144,7 @@ void LLNearbyChatToastPanel::init(LLSD& notification) std::string messageText = notification["message"].asString(); // UTF-8 line of text std::string fromName = notification["from"].asString(); // agent or object name mFromID = notification["from_id"].asUUID(); // agent id or object id + mFromName = fromName; int sType = notification["source"].asInteger(); mSourceType = (EChatSourceType)sType; |