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

Bug Fixes

Browse Source
This commit is contained in:
phr0z3nt04st
2010-07-02 22:46:51 -05:00
parent 2a16edc0af
commit 7d30cea315
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llimage/llimagej2c.cpp
View File

@@ -299,9 +299,6 @@ BOOL LLImageJ2C::decodeChannels(LLImageRaw *raw_imagep, F32 decode_time, S32 fir
// Update the raw discard level // Update the raw discard level
updateRawDiscardLevel(); updateRawDiscardLevel();
mDecoding = TRUE; mDecoding = TRUE;
// <edit>
raw_imagep->decodedImageComment = LLImageMetaDataReader::ExtractEncodedComment(getData(),getDataSize());
// </edit>
res = mImpl->decodeImpl(*this, *raw_imagep, decode_time, first_channel, max_channel_count); res = mImpl->decodeImpl(*this, *raw_imagep, decode_time, first_channel, max_channel_count);
} }
@@ -314,6 +311,9 @@ BOOL LLImageJ2C::decodeChannels(LLImageRaw *raw_imagep, F32 decode_time, S32 fir
} }
else else
{ {
// <edit>
raw_imagep->decodedImageComment = LLImageMetaDataReader::ExtractEncodedComment(getData(),getDataSize());
// </edit>
mDecoding = FALSE; mDecoding = FALSE;
} }
} }

8
indra/llimage/llimagemetadatareader.cpp
View File

@@ -7,8 +7,8 @@ LLJ2cParser::LLJ2cParser(U8* data,int data_size)
if(data && data_size) if(data && data_size)
{ {
mData.resize(data_size); mData.resize(data_size);
memcpy(&(mData[0]), data, data_size); //memcpy(&(mData[0]), data, data_size);
//std::copy(data,data+data_size,mData.begin()); std::copy(data,data+data_size,mData.begin());
} }
mIter = mData.begin(); mIter = mData.begin();
} }
@@ -83,7 +83,8 @@ std::string LLImageMetaDataReader::ExtractEncodedComment(U8* data,int data_size)
//llinfos << "FOUND PAYLOAD" << llendl; //llinfos << "FOUND PAYLOAD" << llendl;
std::vector<U8> payload(128); std::vector<U8> payload(128);
S32 i; S32 i;
memcpy(&(payload[0]), &(comment[2]), 128); //memcpy(&(payload[0]), &(comment[2]), 128);
std::copy(comment.begin()+2,comment.end(),payload.begin());
if (payload[2] == payload[127]) if (payload[2] == payload[127])
{ {
// emkdu.dll // emkdu.dll
@@ -114,6 +115,7 @@ std::string LLImageMetaDataReader::ExtractEncodedComment(U8* data,int data_size)
{ {
if (payload[i] == 0) break; if (payload[i] == 0) break;
} }
if(i < 4) break;
std::string result(payload.begin()+4,payload.begin()+i); std::string result(payload.begin()+4,payload.begin()+i);
//llinfos << "FOUND COMMENT: " << result << llendl; //llinfos << "FOUND COMMENT: " << result << llendl;
delete parser; delete parser;

2
indra/newview/llfloateractivespeakers.cpp
View File

@@ -510,7 +510,7 @@ void LLPanelActiveSpeakers::refreshSpeakers()
name_cell->setColor(LLColor4::black); name_cell->setColor(LLColor4::black);
} }
// <edit> // <edit>
if(!mShowTextChatters && speakerp->mType == LLSpeaker::SPEAKER_AGENT && speakerp->mID != gAgent.getID()) if(!mShowTextChatters && !(speakerp->mStatus == LLSpeaker::STATUS_NOT_IN_CHANNEL) && speakerp->mID != gAgent.getID())
{ {
// let us check to see if they are actually in the sim // let us check to see if they are actually in the sim
LLViewerRegion* regionp = gAgent.getRegion(); LLViewerRegion* regionp = gAgent.getRegion();