diff options
| author | James Cook <james@lindenlab.com> | 2010-05-25 11:40:29 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-25 11:40:29 -0700 |
| commit | d6ea42984553b7adb6f26cf2ed094d32e36814d2 (patch) | |
| tree | 25fe04a20b89ce63ad5c6b32856371c46a728c08 /indra/newview/llnearbychat.cpp | |
| parent | fb51f985c35f5dae85057ad932928b8fcd44cc73 (diff) | |
DEV-50013 Display names load at startup in local chat/IM history
Had to change the chat log file format to include agent_id.
Code will load viewer 2.0 logs, but viewer 2.0 will just discard
data from 2.1 logs, which seems OK. Reviewed with Leyla.
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index f1c13de8bb..74ede67c97 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -301,8 +301,12 @@ void LLNearbyChat::loadHistory() const LLSD& msg = *it; std::string from = msg[IM_FROM]; - LLUUID from_id = LLUUID::null; - if (msg[IM_FROM_ID].isUndefined()) + LLUUID from_id; + if (msg[IM_FROM_ID].isDefined()) + { + from_id = msg[IM_FROM_ID].asUUID(); + } + else { gCacheName->getUUID(from, from_id); } |