summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.cpp
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-06-01 04:47:53 -0700
committerDessie Linden <dessie@lindenlab.com>2010-06-01 04:47:53 -0700
commit20a69c3771937c55a9a25417e8ef1166081a525b (patch)
treefbc5f565464d098815a60d9aea28d92f986e4ffa /indra/newview/llviewertexturelist.cpp
parent66186ea81fd192e1ec88e0ea879af44726c0ea57 (diff)
parent4cc5c7d2a4511ffc65bf3b6b0b2e29beb5b0fed4 (diff)
Merged from viewer-public
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() ;