diff options
| author | McCabe Maxsted | 2011-05-30 12:26:02 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2011-06-02 22:52:51 -0500 |
| commit | 0ac6387d4baf01a376525b8150c8c230fd3c2772 (patch) | |
| tree | 847e552106b41f56c61e9bcee2cd8b242816049b /linden/indra/llrender/llglslshader.cpp | |
| parent | Merge remote-tracking branch 'Kakurady/translation-zh-pub' into next (diff) | |
| download | meta-impy-0ac6387d4baf01a376525b8150c8c230fd3c2772.zip meta-impy-0ac6387d4baf01a376525b8150c8c230fd3c2772.tar.gz meta-impy-0ac6387d4baf01a376525b8150c8c230fd3c2772.tar.bz2 meta-impy-0ac6387d4baf01a376525b8150c8c230fd3c2772.tar.xz | |
Fix for #903 ATI star issue, ported from Phoenix via Shoytl and Singularity
(cherry picked from commit 7d6337fb7683546c17c922aa1b0f7e3ca5982448)
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llrender/llglslshader.cpp | 4 |
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 | ||
| 161 | BOOL LLGLSLShader::attachObject(std::string object) | 161 | BOOL 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]); |