From 8e612ae59f03577a8d5f2f2003dfb53a7f713f69 Mon Sep 17 00:00:00 2001 From: phr0z3nt04st Date: Thu, 27 May 2010 18:59:45 -0500 Subject: [PATCH] I messed up and confused data_size with the number of items in the array.. also did some clean up for readability. --- indra/llmessage/llmessagelog.cpp | 4 ++-- indra/newview/llfloatermessagelog.cpp | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/indra/llmessage/llmessagelog.cpp b/indra/llmessage/llmessagelog.cpp index 73304d7ab..3d715fa97 100644 --- a/indra/llmessage/llmessagelog.cpp +++ b/indra/llmessage/llmessagelog.cpp @@ -9,8 +9,8 @@ LLMessageLogEntry::LLMessageLogEntry(EType type, LLHost from_host, LLHost to_hos { if(data) { - mData.resize(data_size); - mData.assign(data,data + data_size); + mData.resize(data_size/sizeof(U8)); + mData.assign(data,data + data_size/sizeof(U8)); } } LLMessageLogEntry::LLMessageLogEntry(EType type, LLHost from_host, LLHost to_host, std::vector data, S32 data_size) diff --git a/indra/newview/llfloatermessagelog.cpp b/indra/newview/llfloatermessagelog.cpp index ff82f8ad8..e400f14f9 100644 --- a/indra/newview/llfloatermessagelog.cpp +++ b/indra/newview/llfloatermessagelog.cpp @@ -422,12 +422,15 @@ BOOL LLMessageLogFilterApply::tick() { std::deque::iterator end = LLFloaterMessageLog::sMessageLogEntries.end(); if(mIter == end || !LLFloaterMessageLog::sInstance) - mFinished = TRUE; - if(mFinished) { + mFinished = TRUE; if(LLFloaterMessageLog::sInstance) + { if(LLFloaterMessageLog::sInstance->mMessageLogFilterApply == this) + { LLFloaterMessageLog::sInstance->stopApplyingFilter(); + } + } return TRUE; } for(S32 i = 0; i < 256; i++) @@ -436,8 +439,12 @@ BOOL LLMessageLogFilterApply::tick() { mFinished = TRUE; if(LLFloaterMessageLog::sInstance) + { if(LLFloaterMessageLog::sInstance->mMessageLogFilterApply == this) + { LLFloaterMessageLog::sInstance->stopApplyingFilter(); + } + } return TRUE; }