From 4ba15093712a909f4ef71799e9370e38891749ba Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 30 Jun 2012 20:07:52 -0500
Subject: [PATCH] Texcache tweakage.

---
 indra/newview/llgroupmgr.cpp     | 2 +-
 indra/newview/lltexturecache.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 5991cba8e..c89c414b5 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1178,7 +1178,7 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
 
 	group_datap->mChanged = TRUE;
 #if SHY_MOD //Group title script access
-	gGroupRoleChanger.CheckUpdateRole(group_id,group_data->mRoles);
+	gGroupRoleChanger.CheckUpdateRole(group_id,group_datap->mRoles);
 #endif //shy_mod
 	LLGroupMgr::getInstance()->notifyObservers(GC_ROLE_DATA);
 }
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index 58c9afbde..d8e477fa4 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -245,9 +245,9 @@ bool LLTextureCacheLocalFileWorker::doRead()
 		}
 	}
 #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);
 	
@@ -375,7 +375,7 @@ bool LLTextureCacheRemoteWorker::doRead()
 		llassert(local_size != 0);	// we're assuming there is a non empty local file here...
 		if (!mDataSize || mDataSize > local_size - mOffset)
 		{
-			mDataSize = local_size - mOffset;
+			mDataSize = local_size	- mOffset;
 		}
 		// Allocate read buffer
 		mReadData = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), mDataSize);