diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-09-10 10:26:42 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-09-10 10:26:42 -0600 |
| commit | 85053e53b6ffabddf702f5ef8da52fe5c18e7753 (patch) | |
| tree | 93d57cb4c70f1053edd68ed9c9b1548b300daa03 | |
| parent | 820cffd56df5204e2aa0ceb6ce556a318dfaad7b (diff) | |
fix for VWR-22811: crash at LLImageGL::createGLTexture(int,unsigned char const *,int,int) [secondlife-bin llimagegl.cpp] line 1259
| -rw-r--r-- | indra/llrender/llrender.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index e26acd53a3..8eb160f4e7 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -431,6 +431,9 @@ void LLTexUnit::setTextureFilteringOption(LLTexUnit::eTextureFilterOptions optio if (gGL.mMaxAnisotropy < 1.f) { glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &gGL.mMaxAnisotropy); + + llinfos << "gGL.mMaxAnisotropy: " << gGL.mMaxAnisotropy << llendl ; + gGL.mMaxAnisotropy = llmax(1.f, gGL.mMaxAnisotropy) ; } glTexParameterf(sGLTextureType[mCurrTexType], GL_TEXTURE_MAX_ANISOTROPY_EXT, gGL.mMaxAnisotropy); } |