summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.cpp
diff options
context:
space:
mode:
authorleyla <leyla@leyla.com>2010-06-02 11:24:40 -0700
committerleyla <leyla@leyla.com>2010-06-02 11:24:40 -0700
commita282ffedf444462b71f5abc7aeac47768e7344e7 (patch)
tree6634c6131809a23c3af36645ab220e97dd63f18e /indra/newview/llviewertexturelist.cpp
parent507410b63d2e8f5193443a8d5451ccf614ac85e7 (diff)
parent28d23e8c85ba6073cffbd3597342c43f4f9c7971 (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() ;