Add NickyD's fast j2k metadata reader

2012-11-13 05:38:27 +01:00
parent 5eb99b7d2f
commit c37a473287
2 changed files with 73 additions and 6 deletions
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -1316,9 +1316,8 @@ bool LLTextureFetchWorker::doWork(S32 param)
 					}
 				}
 			}
-			mRequestedSize = mDesiredSize;
+			mRequestedSize = mDesiredSize - cur_size;
 			mRequestedDiscard = mDesiredDiscard;
-			mRequestedSize -= cur_size;
 			mRequestedOffset = cur_size;
 			
 			bool res = false;
@@ -1919,7 +1918,7 @@ S32 LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels,
 			// so presumably we have all of it
 			mHaveAllData = TRUE;
 		}
-		mRequestedSize = llmin(data_size, mRequestedSize);
+		mRequestedSize = data_size;
 	}
 	else
 	{