summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-25 07:36:03 -0400
committerOz Linden <oz@lindenlab.com>2011-04-25 07:36:03 -0400
commit10776d2706a9ce33a5793d8fa197d6a7706f29f5 (patch)
treee9bf6efff3fb049fdd7cf0909d86b4c0ac3c668c /indra
parentc0fc4d81e6f35805e3cd1f4672c19b8612bac9a9 (diff)
parent40077972dd96298e24fa663a3bef78e951c5d20d (diff)
merge changes for storm-1111
Diffstat (limited to 'indra')
-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);
}
}