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

Texcache tweakage.

Browse Source
This commit is contained in:
Shyotl
2012-06-30 20:07:52 -05:00
parent 399d93cc36
commit 4ba1509371
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llgroupmgr.cpp
View File

@@ -1178,7 +1178,7 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
group_datap->mChanged = TRUE; group_datap->mChanged = TRUE;
#if SHY_MOD //Group title script access #if SHY_MOD //Group title script access
gGroupRoleChanger.CheckUpdateRole(group_id,group_data->mRoles); gGroupRoleChanger.CheckUpdateRole(group_id,group_datap->mRoles);
#endif //shy_mod #endif //shy_mod
LLGroupMgr::getInstance()->notifyObservers(GC_ROLE_DATA); LLGroupMgr::getInstance()->notifyObservers(GC_ROLE_DATA);
} }

6
indra/newview/lltexturecache.cpp
View File

@@ -245,9 +245,9 @@ bool LLTextureCacheLocalFileWorker::doRead()
} }
} }
#else #else
if (!mDataSize || mDataSize > local_size - mOffset) if (!mDataSize || mDataSize > local_size)
{ {
mDataSize = local_size - mOffset; mDataSize = local_size;
} }
mReadData = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), mDataSize); mReadData = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), mDataSize);
@@ -375,7 +375,7 @@ bool LLTextureCacheRemoteWorker::doRead()
llassert(local_size != 0); // we're assuming there is a non empty local file here... llassert(local_size != 0); // we're assuming there is a non empty local file here...
if (!mDataSize || mDataSize > local_size - mOffset) if (!mDataSize || mDataSize > local_size - mOffset)
{ {
mDataSize = local_size - mOffset; mDataSize = local_size - mOffset;
} }
// Allocate read buffer // Allocate read buffer
mReadData = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), mDataSize); mReadData = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), mDataSize);