diff options
| author | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
| commit | 1df1be10afd14fe80d491617e175f4586a78f71f (patch) | |
| tree | 6e7a55591c2166ae732a7854f329e9bfd800546b /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | 75e5441f2da7252749174db70719a78637bc4eeb (diff) | |
| parent | b20307a683073c415804966ed5b363fb68879ee5 (diff) | |
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; |