diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-19 16:12:07 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-19 16:12:07 -0600 |
| commit | 1616b73ef30bcb3e99be68fb7ccc05f0be78ddf6 (patch) | |
| tree | e22c94948ed8d8c7f35422fc064172ea3662b264 /indra/llrender/llrendertarget.cpp | |
| parent | ea45b8acd25785bd2789c2c1928e223c9a8e2fbd (diff) | |
| parent | d8c02bf06250015b8cb0bcc9c0d8445cfb6acf1c (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
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 a4d77b00d6..a9945f9814 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(); |