summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2010-06-01 18:42:27 -0700
committerMark Palange (Mani) <palange@lindenlab.com>2010-06-01 18:42:27 -0700
commitebee0b30eb8bd2cce773ed5e2f70aa21afeb2924 (patch)
tree2ca64c56c047ebf621e20b61108e78cac73b4756 /indra/newview/llviewertexturelist.cpp
parent7bf5e5c6189a7316b7d1dbcb749c0feb8564c3e5 (diff)
parent6886bd65ddaa07f6fb22e243995964084acce998 (diff)
merge
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r--indra/newview/llviewertexturelist.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index d8918bdb73..1e3311dafe 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -478,7 +478,7 @@ LLViewerFetchedTexture* LLViewerTextureList::createImage(const LLUUID &image_id,
}
else
{
- //by default, the texure can not be removed from memory even if it is not used.
+ //by default, the texture can not be removed from memory even if it is not used.
//here turn this off
//if this texture should be set to NO_DELETE, call setNoDelete() afterwards.
imagep->forceActive() ;