summaryrefslogtreecommitdiff
path: root/indra/newview/llsurface.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-04-21 12:48:50 -0700
committersimon <none@none>2014-04-21 12:48:50 -0700
commita5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (patch)
tree0b58bf76487dca0bc439d1f99cd568f970b9cc32 /indra/newview/llsurface.cpp
parent114084bb80d4991519e2ca4020823319810c64b2 (diff)
parent0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (diff)
Merge downstream code
Diffstat (limited to 'indra/newview/llsurface.cpp')
-rwxr-xr-xindra/newview/llsurface.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp
index f1b27279e3..93c7f54101 100755
--- a/indra/newview/llsurface.cpp
+++ b/indra/newview/llsurface.cpp
@@ -233,12 +233,6 @@ 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++)
@@ -263,12 +257,6 @@ 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++)