summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-02-12 15:11:21 -0800
committerXiaohong Bao <bao@lindenlab.com>2010-02-12 15:11:21 -0800
commit434436ef6b96f74eaf0daf687c6978d5a24d5be7 (patch)
treee0ab227db11dfd8e85b5fe6c24b2c127a9f47a8b /indra/newview/lltexturefetch.cpp
parent2cabf100e22d4f54ebd0ea6ea20b88985a5654c4 (diff)
parentc1b0625f384801cadcd9b8f210fd0c48d036a8a0 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rw-r--r--indra/newview/lltexturefetch.cpp4
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();
}