summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-10-06 15:34:28 -0500
committerDave Parks <davep@lindenlab.com>2011-10-06 15:34:28 -0500
commita90ea46804d1fdb60d44178140b12e341c715178 (patch)
treec27ba15f4400e78531ac1c7b6ddf4c4a47e97ff4
parent40fe25632c62ab6a8bbb817149c159295b365d59 (diff)
SH-2240 Fix for beacons not rendering (or crashing when rendered)
-rw-r--r--indra/newview/llglsandbox.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 8c872283bd..844d7ba41c 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -777,6 +777,11 @@ void LLViewerObjectList::renderObjectBeacons()
LLGLSUIDefault gls_ui;
+ if (LLGLSLShader::sNoFixedFunction)
+ {
+ gUIProgram.bind();
+ }
+
{
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);