summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-12 11:32:31 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-12 11:32:31 +0100
commitd6996c7d3da4ddbb81a7758e508c1aa477d4edc4 (patch)
treeaabe67db61be128f4e11c568c17647e1011213be /indra/newview
parent9fbe736774b1049265fd017bfe2413d436d35706 (diff)
fix merge poopage.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lltexturecache.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index 9bf9c92815..df79725474 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -743,7 +743,6 @@ LLTextureCache::LLTextureCache(bool threaded)
mListMutex(NULL),
mHeaderAPRFile(NULL),
mReadOnly(TRUE), //do not allow to change the texture cache until setReadOnly() is called.
- mReadOnly(TRUE), //do not allow to change the texture cache until setReadOnly() is called.
mTexturesSizeTotal(0),
mDoPurge(FALSE)
{