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

Make texture fetch type (mFTType) a const member variable and remove from init() call. forceRefetch was clobbering mFFType via init call and firstinit boolean is a stupid hack.

Browse Source
This commit is contained in:
Shyotl
2019-04-23 15:23:04 -05:00
parent 7f776c0d53
commit d7e7701927
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lltexturefetch.cpp
View File

@@ -263,7 +263,7 @@ private:
LLPointer<LLImageFormatted> mFormattedImage;
LLPointer<LLImageRaw> mRawImage,
mAuxImage;
FTType mFTType;
const FTType mFTType;
LLUUID mID;
LLHost mHost;
std::string mUrl;
@@ -483,7 +483,7 @@ private:
LLTextureFetch* mFetcher;
LLUUID mID;
FTType mFTType;
const FTType mFTType;
LLPointer<LLHTTPRetryPolicy> mFetchRetryPolicy;
U64 mMetricsStartTime;
S32 mRequestedSize;
@@ -1247,7 +1247,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
{
if (mFTType != FTT_DEFAULT)
{
LL_WARNS(LOG_TXT) << "trying to seek a non-default texture on the sim. Bad!" << LL_ENDL;
LL_WARNS(LOG_TXT) << "trying to seek a non-default texture on the sim. Bad! mFTType: " << mFTType << LL_ENDL;
}
mUrl = http_url + "/?texture_id=" + mID.asString().c_str();
LL_DEBUGS(LOG_TXT) << "Texture URL: " << mUrl << LL_ENDL;