Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I messed up and confused data_size with the number of items in the

Browse Source 
array.. also did some clean up for readability.
This commit is contained in:
phr0z3nt04st
2010-05-27 18:59:45 -05:00
parent e6aa35608f
commit 8e612ae59f
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llmessage/llmessagelog.cpp
View File

@@ -9,8 +9,8 @@ LLMessageLogEntry::LLMessageLogEntry(EType type, LLHost from_host, LLHost to_hos
{ {
if(data) if(data)
{ {
mData.resize(data_size); mData.resize(data_size/sizeof(U8));
mData.assign(data,data + data_size); mData.assign(data,data + data_size/sizeof(U8));
} }
} }
LLMessageLogEntry::LLMessageLogEntry(EType type, LLHost from_host, LLHost to_host, std::vector<U8> data, S32 data_size) LLMessageLogEntry::LLMessageLogEntry(EType type, LLHost from_host, LLHost to_host, std::vector<U8> data, S32 data_size)

11
indra/newview/llfloatermessagelog.cpp
View File

@@ -422,12 +422,15 @@ BOOL LLMessageLogFilterApply::tick()
{ {
std::deque<LLMessageLogEntry>::iterator end = LLFloaterMessageLog::sMessageLogEntries.end(); std::deque<LLMessageLogEntry>::iterator end = LLFloaterMessageLog::sMessageLogEntries.end();
if(mIter == end || !LLFloaterMessageLog::sInstance) if(mIter == end || !LLFloaterMessageLog::sInstance)
mFinished = TRUE;
if(mFinished)
{ {
mFinished = TRUE;
if(LLFloaterMessageLog::sInstance) if(LLFloaterMessageLog::sInstance)
{
if(LLFloaterMessageLog::sInstance->mMessageLogFilterApply == this) if(LLFloaterMessageLog::sInstance->mMessageLogFilterApply == this)
{
LLFloaterMessageLog::sInstance->stopApplyingFilter(); LLFloaterMessageLog::sInstance->stopApplyingFilter();
}
}
return TRUE; return TRUE;
} }
for(S32 i = 0; i < 256; i++) for(S32 i = 0; i < 256; i++)
@@ -436,8 +439,12 @@ BOOL LLMessageLogFilterApply::tick()
{ {
mFinished = TRUE; mFinished = TRUE;
if(LLFloaterMessageLog::sInstance) if(LLFloaterMessageLog::sInstance)
{
if(LLFloaterMessageLog::sInstance->mMessageLogFilterApply == this) if(LLFloaterMessageLog::sInstance->mMessageLogFilterApply == this)
{
LLFloaterMessageLog::sInstance->stopApplyingFilter(); LLFloaterMessageLog::sInstance->stopApplyingFilter();
}
}
return TRUE; return TRUE;
} }