summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-06-01 14:33:44 -0700
committerJames Cook <james@lindenlab.com>2010-06-01 14:33:44 -0700
commit49c221b9678c33d5dbe71a68ca35d0b28fff3edd (patch)
tree0214531fe7d433a220240b766d928f7a49e2ed92 /indra/newview/llviewertexturelist.cpp
parent010dba68ad923cf66b1e05e6969a21f7288fe78a (diff)
parent7ea46b968cf7df3afc1e879f90f1124157f5a79d (diff)
Merge with dessie/viewer-public in prep to land code there
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() ;