diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/lltexturefetch.cpp | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index e9dd7921cd..be535761fc 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1877,6 +1877,21 @@ bool LLTextureFetch::receiveImagePacket(const LLHost& host, const LLUUID& id, U1 } ////////////////////////////////////////////////////////////////////////////// +BOOL LLTextureFetch::isFromLocalCache(const LLUUID& id) +{ + BOOL from_cache = FALSE ; + + LLMutexLock lock(&mQueueMutex); + LLTextureFetchWorker* worker = getWorker(id); + if (worker) + { + worker->lockWorkData(); + from_cache = worker->mInLocalCache ; + worker->unlockWorkData(); + } + + return from_cache ; +} S32 LLTextureFetch::getFetchState(const LLUUID& id, F32& data_progress_p, F32& requested_priority_p, U32& fetch_priority_p, F32& fetch_dtime_p, F32& request_dtime_p) |