diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-01 15:25:35 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-01 15:25:35 -0600 |
| commit | 99b0d17833a8a2efab9c08edf2ada3718736a5ba (patch) | |
| tree | 8951e7aabe026917d299436ebc28019f9966cd02 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | 746037362ed07af0c799caf22cf9e425744359a0 (diff) | |
| parent | 7564813d608f79e6fc70e1f58a861c640d1b6fa2 (diff) | |
Merge with viewer-2-0
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; |