diff options
author | Callum Prentice <callum@lindenlab.com> | 2010-02-12 15:26:08 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2010-02-12 15:26:08 -0800 |
commit | ae39812d704a2b92faf213f1626dbe19a34eceb4 (patch) | |
tree | c26efa4fb4a033db1d5c65d84fbaade14ec1d756 /indra/newview/lltexturefetch.cpp | |
parent | c0f2f151b226417152adecb507e6b1b7f2a1f8ce (diff) | |
parent | 434436ef6b96f74eaf0daf687c6978d5a24d5be7 (diff) |
Merge with tip
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rw-r--r-- | indra/newview/lltexturefetch.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 6dcf4bc798..6c35464a51 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1515,8 +1515,8 @@ bool LLTextureFetch::createRequest(const std::string& url, const LLUUID& id, con unlockQueue() ; worker->lockWorkMutex(); - worker->mActiveCount++; - worker->mNeedsAux = needs_aux; + worker->mActiveCount++; + worker->mNeedsAux = needs_aux; worker->unlockWorkMutex(); } |