summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-04 19:28:25 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-04 19:28:25 -0500
commit5c2bab0495c649b564cba966fc1132386bf86749 (patch)
tree314756b8dbf07020bfe6e317868e4c30439f2552
parente1c5abce9309a89bd9993264bca8dadadf882c6f (diff)
parentc527ade45beb1db2e1801646945812344a520ed0 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
-rw-r--r--indra/newview/llmaniptranslate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index 2153f77336..f1b3a37677 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -163,7 +163,7 @@ void LLManipTranslate::restoreGL()
GLuint* d = new GLuint[rez*rez];
- gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, sGridTex->getTexName());
+ gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, sGridTex->getTexName(), true);
gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_TRILINEAR);
while (rez >= 1)