diff options
author | thickbrick | 2010-10-16 03:11:19 +0200 |
---|---|---|
committer | thickbrick | 2010-10-16 03:11:19 +0200 |
commit | f99462872fd9d54658f8702929583bd4a607b21a (patch) | |
tree | 05634b9a789e24389ecc08557d1beeb4d1df4a47 | |
parent | Fix typo in buggy OpenSim version detection. (diff) | |
download | meta-impy-f99462872fd9d54658f8702929583bd4a607b21a.zip meta-impy-f99462872fd9d54658f8702929583bd4a607b21a.tar.gz meta-impy-f99462872fd9d54658f8702929583bd4a607b21a.tar.bz2 meta-impy-f99462872fd9d54658f8702929583bd4a607b21a.tar.xz |
Fix the fix - bad logic for failed http requests
-rw-r--r-- | linden/indra/newview/lltexturefetch.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp index e307aff..a39e2df 100644 --- a/linden/indra/newview/lltexturefetch.cpp +++ b/linden/indra/newview/lltexturefetch.cpp | |||
@@ -1395,6 +1395,10 @@ void LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels, | |||
1395 | mRequestedSize = data_size; | 1395 | mRequestedSize = data_size; |
1396 | } | 1396 | } |
1397 | } | 1397 | } |
1398 | else | ||
1399 | { | ||
1400 | mRequestedSize = -1; // error | ||
1401 | } | ||
1398 | 1402 | ||
1399 | if ((success && (data_size == 0)) || unsatisfiable) | 1403 | if ((success && (data_size == 0)) || unsatisfiable) |
1400 | { | 1404 | { |
@@ -1410,11 +1414,7 @@ void LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels, | |||
1410 | mRequestedSize = -1; // treat this fetch as if it failed. | 1414 | mRequestedSize = -1; // treat this fetch as if it failed. |
1411 | } | 1415 | } |
1412 | } | 1416 | } |
1413 | else | 1417 | |
1414 | { | ||
1415 | mRequestedSize = -1; // error | ||
1416 | } | ||
1417 | |||
1418 | mLoaded = TRUE; | 1418 | mLoaded = TRUE; |
1419 | setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority); | 1419 | setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority); |
1420 | } | 1420 | } |