summaryrefslogtreecommitdiff
path: root/indra/llrender/llrender.cpp
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-07-19 21:52:37 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-07-19 21:52:37 +0000
commit08f04113c9252258c9cb6132efa327432c3c27e0 (patch)
tree5ec6c6d42eaca354f58e21b926d9108e43367484 /indra/llrender/llrender.cpp
parent10f84d8244d01728338f1eb20b0b25271fc7db63 (diff)
parentaa322d8eb4341c213a19cef87a887114c1ca278b (diff)
Merged in DV541-merge-6.4.22 (pull request #629)
DRTVWR-541 merge up to v 6.4.22
Diffstat (limited to 'indra/llrender/llrender.cpp')
-rw-r--r--indra/llrender/llrender.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index d515fc707a..03b6aac20c 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -50,6 +50,7 @@ U32 LLRender::sUIVerts = 0;
U32 LLTexUnit::sWhiteTexture = 0;
bool LLRender::sGLCoreProfile = false;
bool LLRender::sNsightDebugSupport = false;
+LLVector2 LLRender::sUIGLScaleFactor = LLVector2(1.f, 1.f);
static const U32 LL_NUM_TEXTURE_LAYERS = 32;
static const U32 LL_NUM_LIGHT_UNITS = 8;