diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:14:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:14:23 -0400 |
| commit | 731fe3e7c6287c63134c1a08572f9d97a0eb0ff0 (patch) | |
| tree | 142060ca39c7e495d05edf7e0359a15716840705 /indra/llrender/llrendertarget.cpp | |
| parent | 53eff025bc205e3127da4dc0c3df3cb406eb1153 (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 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(); |