summaryrefslogtreecommitdiff
path: root/indra/llrender/llrender.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-01-12 12:59:37 +0200
committerMike Antipov <mantipov@productengine.com>2010-01-12 12:59:37 +0200
commit94880f98fdcf3a2c7276e9f74f108ae35d9b3587 (patch)
tree665acec55ffa8aecb43da156c5045f5fc2bb3cf8 /indra/llrender/llrender.cpp
parentbcb054970ce83fc613e1b6d163b3440457ca94d4 (diff)
parent3c3271761b918a19f7a10d80da9dd23e5127de2c (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
Diffstat (limited to 'indra/llrender/llrender.cpp')
-rw-r--r--indra/llrender/llrender.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index fc45df8153..f97d81126e 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -162,6 +162,8 @@ void LLTexUnit::enable(eTextureType type)
disable(); // Force a disable of a previous texture type if it's enabled.
}
mCurrTexType = type;
+
+ gGL.flush();
glEnable(sGLTextureType[type]);
}
}