aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llglslshader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llrender/llglslshader.cpp')
-rw-r--r--linden/indra/llrender/llglslshader.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/llrender/llglslshader.cpp b/linden/indra/llrender/llglslshader.cpp
index 08d6548..429cf6f 100644
--- a/linden/indra/llrender/llglslshader.cpp
+++ b/linden/indra/llrender/llglslshader.cpp
@@ -160,7 +160,9 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes,
160 160
161BOOL LLGLSLShader::attachObject(std::string object) 161BOOL LLGLSLShader::attachObject(std::string object)
162{ 162{
163 if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0) 163 //if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0)
164 std::map<std::string, GLhandleARB> &ShaderObjects = LLShaderMgr::instance()->mShaderObjects;
165 if (ShaderObjects.find(object) != ShaderObjects.end())
164 { 166 {
165 stop_glerror(); 167 stop_glerror();
166 glAttachObjectARB(mProgramObject, LLShaderMgr::instance()->mShaderObjects[object]); 168 glAttachObjectARB(mProgramObject, LLShaderMgr::instance()->mShaderObjects[object]);