diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-20 15:20:27 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-20 15:20:27 -0700 |
| commit | e3f5b66d5a649b061e470bba44fa29a56f7b93b5 (patch) | |
| tree | 293bfd9c668c116e92a9dc44326833f51e47b7f2 /indra/newview | |
| parent | 47e31543932815adf89712229c0ad71b17d8a0f1 (diff) | |
fix for SH-829: Viewer attempting to load precached images in file types that are not being used.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltexturecache.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index 6a213309a0..83772496d5 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -326,6 +326,7 @@ bool LLTextureCacheRemoteWorker::doRead() // First state / stage : find out if the file is local if (mState == INIT) { +#if 0 std::string filename = mCache->getLocalFileName(mID); // Is it a JPEG2000 file? { @@ -360,6 +361,11 @@ bool LLTextureCacheRemoteWorker::doRead() } // Determine the next stage: if we found a file, then LOCAL else CACHE mState = (local_size > 0 ? LOCAL : CACHE); + + llassert_always(mState == CACHE) ; +#else + mState = CACHE; +#endif } // Second state / stage : if the file is local, load it and leave |