diff options
| author | James Cook <james@lindenlab.com> | 2010-06-01 08:35:29 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-06-01 08:35:29 -0700 |
| commit | f9110055b97801249dfdad3e742539ded281b82f (patch) | |
| tree | 64d91c1b02940d57edbcc4f8dea5ec3596415777 /indra/newview/llchathistory.cpp | |
| parent | 7d5e49ac619c9b3e5a00fbb4458f8c149658e194 (diff) | |
| parent | 7666922593084fc741931662ba846284e39f6e9c (diff) | |
Merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -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, |