diff options
author | Dave Parks <davep@lindenlab.com> | 2014-06-23 23:10:45 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2014-06-23 23:10:45 -0500 |
commit | 07e7fbb4ade2e05c4863ca1e40ce26304449697d (patch) | |
tree | 5acffd42d0350550843db2d9aaf089662d5aeddb /indra/newview/llviewertexture.cpp | |
parent | 246d501440deaec8831d68890bc0d708e654dda8 (diff) | |
parent | 90ee53f5a1ac47ec5f8eb84bc543376a089e0d55 (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rwxr-xr-x | indra/newview/llviewertexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index ba89aafc84..e16caf167d 100755 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -64,7 +64,7 @@ // extern const S32Megabytes gMinVideoRam(32); -const S32Megabytes gMaxVideoRam(512); +const S32Megabytes gMaxVideoRam(4096); // statics |