summaryrefslogtreecommitdiff
path: root/indra/newview/llfeaturemanager.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-27 15:33:46 -0400
committerOz Linden <oz@lindenlab.com>2011-05-27 15:33:46 -0400
commit0c360c5223af6473b701f2f41d525f1f70c2ead5 (patch)
treedc59a8390988ece0d340632171f06e0af83507e1 /indra/newview/llfeaturemanager.cpp
parent7a7a0f0c1bd134fa23d734d672ef44a763a9f228 (diff)
parent170de8330e3be55794878cefb53f62266c9a029d (diff)
merge changes for storm-1210
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rw-r--r--indra/newview/llfeaturemanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 3bdab75acf..83844048d1 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -765,7 +765,7 @@ void LLFeatureManager::applyBaseMasks()
{
maskFeatures("OpenGLPre30");
}
- if (gGLManager.mNumTextureUnits <= 8)
+ if (gGLManager.mNumTextureImageUnits <= 8)
{
maskFeatures("TexUnit8orLess");
}