diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-08-22 14:58:10 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-08-22 14:58:10 -0700 |
| commit | a8d5b070b090d7467a1e95134be556951ae6698a (patch) | |
| tree | 66bc89a1aa416382f0af17d8714d5a31e8c0c10d /indra/llrender/llrendertarget.cpp | |
| parent | 4595978d59d905bc9ef95efd759eac8cb62b57c3 (diff) | |
| parent | 171089207b528ab80a954292c127ba77254ee927 (diff) | |
merging viewer release
Diffstat (limited to 'indra/llrender/llrendertarget.cpp')
| -rwxr-xr-x | indra/llrender/llrendertarget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index 6e22712b94..d53c37a847 100755 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -117,8 +117,8 @@ void LLRenderTarget::resize(U32 resx, U32 resy, U32 color_fmt) bool LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth, bool stencil, LLTexUnit::eTextureType usage, bool use_fbo, S32 samples) { - resx = llmin(resx, (U32) 4096); - resy = llmin(resy, (U32) 4096); + resx = llmin(resx, (U32) gGLManager.mGLMaxTextureSize); + resy = llmin(resy, (U32) gGLManager.mGLMaxTextureSize); stop_glerror(); release(); |