summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychat.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-05-02 17:57:52 -0700
committerRichard Linden <none@none>2011-05-02 17:57:52 -0700
commitd5faa4f38d338777463b7ad6eb3239041d43fe28 (patch)
treed57efbda59c9f677b2245bebc97fec129f3f9fad /indra/newview/llnearbychat.cpp
parent9a6f06687e5b467f0c049bfbf88c2131eee11ef3 (diff)
parent78d76eb4b01e0bd6db41a67d1573a1b841cbe993 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
-rw-r--r--indra/newview/llnearbychat.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 572eeb8fc7..03ebc344f1 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -250,9 +250,13 @@ void LLNearbyChat::getAllowedRect(LLRect& rect)
void LLNearbyChat::updateChatHistoryStyle()
{
mChatHistory->clear();
+
+ LLSD do_not_log;
+ do_not_log["do_not_log"] = true;
for(std::vector<LLChat>::iterator it = mMessageArchive.begin();it!=mMessageArchive.end();++it)
{
- addMessage(*it,false);
+ // Update the messages without re-writing them to a log file.
+ addMessage(*it,false, do_not_log);
}
}