diff options
author | simon <none@none> | 2014-03-26 10:08:19 -0700 |
---|---|---|
committer | simon <none@none> | 2014-03-26 10:08:19 -0700 |
commit | 70006f4a5651ebaa0362ec2f95b5dda13f72e5c7 (patch) | |
tree | 6e1f7e8ccea28fa830bca7f2508a626f6ca907c9 /indra/newview/llsurface.cpp | |
parent | 73ef75498692e7b7cecb4960f4e308061917d86e (diff) | |
parent | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (diff) |
Pull in downstream -tiger, -bear, viewer-release and become version 3.7.5
Diffstat (limited to 'indra/newview/llsurface.cpp')
-rwxr-xr-x | indra/newview/llsurface.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp index 93c7f54101..f1b27279e3 100755 --- a/indra/newview/llsurface.cpp +++ b/indra/newview/llsurface.cpp @@ -233,6 +233,12 @@ void LLSurface::createSTexture() // GL NOT ACTIVE HERE LLPointer<LLImageRaw> raw = new LLImageRaw(sTextureSize, sTextureSize, 3); U8 *default_texture = raw->getData(); + + if (!default_texture) + { + return; + } + for (S32 i = 0; i < sTextureSize; i++) { for (S32 j = 0; j < sTextureSize; j++) @@ -257,6 +263,12 @@ void LLSurface::createWaterTexture() // Create the water texture LLPointer<LLImageRaw> raw = new LLImageRaw(sTextureSize/2, sTextureSize/2, 4); U8 *default_texture = raw->getData(); + + if (!default_texture) + { + return; + } + for (S32 i = 0; i < sTextureSize/2; i++) { for (S32 j = 0; j < sTextureSize/2; j++) |