summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-12-03 12:07:18 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-12-03 12:07:18 -0800
commita5c5a6598c530f968bf5ed45a03d8ddd23abef9c (patch)
treed742613cf5c4297a1c1eaf3cae44b6f6d724c386 /indra/newview/lltexturefetch.cpp
parent2d3f9a4832c80efc63942725a54e191d2050ff1e (diff)
Un-threaded LLTextureFetch to address potential performance and edge case crash issues.
Changed an assert to an llerrs with extra info Added "HTTP Textures" to "Develop" menu
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rw-r--r--indra/newview/lltexturefetch.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 9bb2a4ad0a..ef49d7f057 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -736,7 +736,8 @@ bool LLTextureFetchWorker::doWork(S32 param)
}
else
{
- llwarns << "Region not found for host: " << mHost << llendl;
+ // This will happen if not logged in or if a region deoes not have HTTP Texture enabled
+ //llwarns << "Region not found for host: " << mHost << llendl;
}
}
if (!mUrl.empty())
@@ -943,11 +944,14 @@ bool LLTextureFetchWorker::doWork(S32 param)
{
llerrs << "Decode entered with invalid mFormattedImage. ID = " << mID << llendl;
}
+ if (mLoadedDiscard < 0)
+ {
+ llerrs << "Decode entered with invalid mLoadedDiscard. ID = " << mID << llendl;
+ }
setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it
mRawImage = NULL;
mAuxImage = NULL;
llassert_always(mFormattedImage.notNull());
- llassert_always(mLoadedDiscard >= 0);
S32 discard = mHaveAllData ? 0 : mLoadedDiscard;
U32 image_priority = LLWorkerThread::PRIORITY_NORMAL | mWorkPriority;
mDecoded = FALSE;