diff options
author | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:51:40 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:51:40 -0400 |
commit | 70cacc4d17790f13d62188a49d814f94da9301d5 (patch) | |
tree | 2da7d156c9529c74b66bfb0fd9c4ec064a6f5e35 /indra/llrender/llrendertarget.cpp | |
parent | 561e0bb1a09e613e6fb41f6a31f1b182b9caa19c (diff) | |
parent | 171089207b528ab80a954292c127ba77254ee927 (diff) |
merge changes for 3.6.3-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 873a20a0c1..5ea8387c04 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(); |