diff options
| author | James Cook <james@lindenlab.com> | 2010-06-01 06:20:07 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-06-01 06:20:07 -0700 |
| commit | 6863c9eb3d0b50dcf31ae8a8b4a2bab50e481296 (patch) | |
| tree | dbcd381f97d1b27943bbc8266d53f4a256febafb /indra/newview | |
| parent | 99aea0f4e7f49d202bb2b4c85cafb2c2d8aa6987 (diff) | |
Avoid name lookups when loading chat history on startup
Also fixes DEV-50451, ??? for object names in chat history log
on login.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 5323ecce72..c52e8daf43 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -274,10 +274,14 @@ public: user_name->setValue(mFrom); updateMinUserNameWidth(); } - else if (mSourceType == CHAT_SOURCE_AGENT) + else if (mSourceType == CHAT_SOURCE_AGENT + && chat.mChatStyle != CHAT_STYLE_HISTORY) { - // ...from a normal user, lookup the name and fill in later, - // but start with blank so sample data from XUI XML doesn't + // ...from a normal user, lookup the name and fill in later. + // *NOTE: Do not do this for chat history logs, otherwise the viewer + // will flood the People API with lookup requests on startup + + // Start with blank so sample data from XUI XML doesn't // flash on the screen user_name->setValue( LLSD() ); LLAvatarNameCache::get(mAvatarID, |