diff options
Diffstat (limited to 'linden/indra/newview/lltexturefetch.cpp')
-rw-r--r-- | linden/indra/newview/lltexturefetch.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp index e945102..80b8b4d 100644 --- a/linden/indra/newview/lltexturefetch.cpp +++ b/linden/indra/newview/lltexturefetch.cpp | |||
@@ -71,7 +71,7 @@ private: | |||
71 | LLTextureFetchWorker* worker = mFetcher->getWorker(mID); | 71 | LLTextureFetchWorker* worker = mFetcher->getWorker(mID); |
72 | if (worker) | 72 | if (worker) |
73 | { | 73 | { |
74 | llinfos << "LLTextureFetchWorker::URLResponder::error " << status << ": " << reason << llendl; | 74 | // llwarns << "LLTextureFetchWorker::URLResponder::error " << status << ": " << reason << llendl; |
75 | worker->callbackURLReceived(LLSD(), false); | 75 | worker->callbackURLReceived(LLSD(), false); |
76 | } | 76 | } |
77 | mFetcher->unlockQueue(); | 77 | mFetcher->unlockQueue(); |
@@ -121,7 +121,7 @@ private: | |||
121 | } | 121 | } |
122 | else | 122 | else |
123 | { | 123 | { |
124 | llinfos << "LLTextureFetchWorker::HTTPGetResponder::error " << status << ": " << cstr << llendl; | 124 | // llinfos << "LLTextureFetchWorker::HTTPGetResponder::error " << status << ": " << cstr << llendl; |
125 | worker->callbackHttpGet(NULL, -1, true); | 125 | worker->callbackHttpGet(NULL, -1, true); |
126 | } | 126 | } |
127 | } | 127 | } |
@@ -679,7 +679,7 @@ bool LLTextureFetchWorker::doWork(S32 param) | |||
679 | mFirstPacket = (data_size - FIRST_PACKET_SIZE) / MAX_IMG_PACKET_SIZE + 1; | 679 | mFirstPacket = (data_size - FIRST_PACKET_SIZE) / MAX_IMG_PACKET_SIZE + 1; |
680 | if (FIRST_PACKET_SIZE + (mFirstPacket-1) * MAX_IMG_PACKET_SIZE != data_size) | 680 | if (FIRST_PACKET_SIZE + (mFirstPacket-1) * MAX_IMG_PACKET_SIZE != data_size) |
681 | { | 681 | { |
682 | llwarns << "Bad CACHED TEXTURE size: " << data_size << " removing." << llendl; | 682 | // llwarns << "Bad CACHED TEXTURE size: " << data_size << " removing." << llendl; |
683 | removeFromCache(); | 683 | removeFromCache(); |
684 | resetFormattedData(); | 684 | resetFormattedData(); |
685 | clearPackets(); | 685 | clearPackets(); |
@@ -711,7 +711,7 @@ bool LLTextureFetchWorker::doWork(S32 param) | |||
711 | if (!mFormattedImage->getDataSize()) | 711 | if (!mFormattedImage->getDataSize()) |
712 | { | 712 | { |
713 | // processSimulatorPackets() failed | 713 | // processSimulatorPackets() failed |
714 | llwarns << "processSimulatorPackets() failed to load buffer" << llendl; | 714 | // llwarns << "processSimulatorPackets() failed to load buffer" << llendl; |
715 | return true; // failed | 715 | return true; // failed |
716 | } | 716 | } |
717 | setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority); | 717 | setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority); |
@@ -747,7 +747,7 @@ bool LLTextureFetchWorker::doWork(S32 param) | |||
747 | } | 747 | } |
748 | else | 748 | else |
749 | { | 749 | { |
750 | llwarns << mID << ": HTTP get url failed, requesting from simulator" << llendl; | 750 | // llwarns << mID << ": HTTP get url failed, requesting from simulator" << llendl; |
751 | mSentRequest = FALSE; | 751 | mSentRequest = FALSE; |
752 | mState = LOAD_FROM_SIMULATOR; | 752 | mState = LOAD_FROM_SIMULATOR; |
753 | return false; | 753 | return false; |
@@ -765,7 +765,7 @@ bool LLTextureFetchWorker::doWork(S32 param) | |||
765 | } | 765 | } |
766 | else | 766 | else |
767 | { | 767 | { |
768 | llwarns << mID << ": HTTP get url is empty, requesting from simulator" << llendl; | 768 | // llwarns << mID << ": HTTP get url is empty, requesting from simulator" << llendl; |
769 | mSentRequest = FALSE; | 769 | mSentRequest = FALSE; |
770 | mState = LOAD_FROM_SIMULATOR; | 770 | mState = LOAD_FROM_SIMULATOR; |
771 | return false; | 771 | return false; |
@@ -816,7 +816,7 @@ bool LLTextureFetchWorker::doWork(S32 param) | |||
816 | S32 cur_size = mFormattedImage->getDataSize(); | 816 | S32 cur_size = mFormattedImage->getDataSize(); |
817 | if (mRequestedSize < 0) | 817 | if (mRequestedSize < 0) |
818 | { | 818 | { |
819 | llwarns << "http get failed for: " << mID << llendl; | 819 | // llwarns << "http get failed for: " << mID << llendl; |
820 | if (cur_size == 0) | 820 | if (cur_size == 0) |
821 | { | 821 | { |
822 | resetFormattedData(); | 822 | resetFormattedData(); |
@@ -882,7 +882,7 @@ bool LLTextureFetchWorker::doWork(S32 param) | |||
882 | if (mCachedSize > 0 && !mInLocalCache && mRetryAttempt == 0) | 882 | if (mCachedSize > 0 && !mInLocalCache && mRetryAttempt == 0) |
883 | { | 883 | { |
884 | // Cache file should be deleted, try again | 884 | // Cache file should be deleted, try again |
885 | llwarns << mID << ": Decode of cached file failed (removed), retrying" << llendl; | 885 | // llwarns << mID << ": Decode of cached file failed (removed), retrying" << llendl; |
886 | mFormattedImage = NULL; | 886 | mFormattedImage = NULL; |
887 | ++mRetryAttempt; | 887 | ++mRetryAttempt; |
888 | setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority); | 888 | setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority); |
@@ -891,7 +891,7 @@ bool LLTextureFetchWorker::doWork(S32 param) | |||
891 | } | 891 | } |
892 | else | 892 | else |
893 | { | 893 | { |
894 | llwarns << "UNABLE TO LOAD TEXTURE: " << mID << " RETRIES: " << mRetryAttempt << llendl; | 894 | // llwarns << "UNABLE TO LOAD TEXTURE: " << mID << " RETRIES: " << mRetryAttempt << llendl; |
895 | mState = DONE; // failed | 895 | mState = DONE; // failed |
896 | } | 896 | } |
897 | } | 897 | } |
@@ -1148,7 +1148,7 @@ void LLTextureFetchWorker::callbackHttpGet(U8* data, S32 data_size, bool last_bl | |||
1148 | else if (data_size > mRequestedSize) | 1148 | else if (data_size > mRequestedSize) |
1149 | { | 1149 | { |
1150 | // *TODO: This will happen until we fix LLCurl::getByteRange() | 1150 | // *TODO: This will happen until we fix LLCurl::getByteRange() |
1151 | llinfos << "HUH?" << llendl; | 1151 | // llinfos << "HUH?" << llendl; |
1152 | mHaveAllData = TRUE; | 1152 | mHaveAllData = TRUE; |
1153 | mFormattedImage->deleteData(); | 1153 | mFormattedImage->deleteData(); |
1154 | mBufferSize = data_size; | 1154 | mBufferSize = data_size; |
@@ -1179,7 +1179,7 @@ void LLTextureFetchWorker::callbackCacheRead(bool success, LLImageFormatted* ima | |||
1179 | LLMutexLock lock(&mWorkMutex); | 1179 | LLMutexLock lock(&mWorkMutex); |
1180 | if (mState != LOAD_FROM_TEXTURE_CACHE) | 1180 | if (mState != LOAD_FROM_TEXTURE_CACHE) |
1181 | { | 1181 | { |
1182 | llwarns << "Read callback for " << mID << " with state = " << mState << llendl; | 1182 | // llwarns << "Read callback for " << mID << " with state = " << mState << llendl; |
1183 | return; | 1183 | return; |
1184 | } | 1184 | } |
1185 | if (success) | 1185 | if (success) |
@@ -1203,7 +1203,7 @@ void LLTextureFetchWorker::callbackCacheWrite(bool success) | |||
1203 | LLMutexLock lock(&mWorkMutex); | 1203 | LLMutexLock lock(&mWorkMutex); |
1204 | if (mState != WAIT_ON_WRITE) | 1204 | if (mState != WAIT_ON_WRITE) |
1205 | { | 1205 | { |
1206 | llwarns << "Write callback for " << mID << " with state = " << mState << llendl; | 1206 | // llwarns << "Write callback for " << mID << " with state = " << mState << llendl; |
1207 | return; | 1207 | return; |
1208 | } | 1208 | } |
1209 | mWritten = TRUE; | 1209 | mWritten = TRUE; |
@@ -1216,7 +1216,7 @@ void LLTextureFetchWorker::callbackDecoded(bool success) | |||
1216 | { | 1216 | { |
1217 | if (mState != DECODE_IMAGE_UPDATE) | 1217 | if (mState != DECODE_IMAGE_UPDATE) |
1218 | { | 1218 | { |
1219 | llwarns << "Decode callback for " << mID << " with state = " << mState << llendl; | 1219 | // llwarns << "Decode callback for " << mID << " with state = " << mState << llendl; |
1220 | return; | 1220 | return; |
1221 | } | 1221 | } |
1222 | // llinfos << mID << " : DECODE COMPLETE " << llendl; | 1222 | // llinfos << mID << " : DECODE COMPLETE " << llendl; |
@@ -1259,7 +1259,7 @@ bool LLTextureFetchWorker::decodeImage() | |||
1259 | } | 1259 | } |
1260 | else | 1260 | else |
1261 | { | 1261 | { |
1262 | llwarns << "DECODE FAILED: " << mID << " Discard: " << (S32)mFormattedImage->getDiscardLevel() << llendl; | 1262 | // llwarns << "DECODE FAILED: " << mID << " Discard: " << (S32)mFormattedImage->getDiscardLevel() << llendl; |
1263 | removeFromCache(); | 1263 | removeFromCache(); |
1264 | } | 1264 | } |
1265 | mImageWorker->scheduleDelete(); | 1265 | mImageWorker->scheduleDelete(); |
@@ -1780,7 +1780,7 @@ bool LLTextureFetch::receiveImageHeader(const LLHost& host, const LLUUID& id, U8 | |||
1780 | } | 1780 | } |
1781 | else if (!data_size) | 1781 | else if (!data_size) |
1782 | { | 1782 | { |
1783 | llwarns << "Img: " << id << ":" << " Empty Image Header" << llendl; | 1783 | // llwarns << "Img: " << id << ":" << " Empty Image Header" << llendl; |
1784 | res = false; | 1784 | res = false; |
1785 | } | 1785 | } |
1786 | if (!res) | 1786 | if (!res) |
@@ -1825,7 +1825,7 @@ bool LLTextureFetch::receiveImagePacket(const LLHost& host, const LLUUID& id, U1 | |||
1825 | } | 1825 | } |
1826 | else if (!data_size) | 1826 | else if (!data_size) |
1827 | { | 1827 | { |
1828 | llwarns << "Img: " << id << ":" << " Empty Image Header" << llendl; | 1828 | // llwarns << "Img: " << id << ":" << " Empty Image Header" << llendl; |
1829 | res = false; | 1829 | res = false; |
1830 | } | 1830 | } |
1831 | if (!res) | 1831 | if (!res) |