summaryrefslogtreecommitdiff
path: root/indra/llrender/llcubemap.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-04-21 13:04:07 -0700
committersimon <none@none>2014-04-21 13:04:07 -0700
commitfdb28bccb92d121f1b3dfc068a50d5cc3db43ce9 (patch)
tree391f32cc407d6e9c14bd4804b7ece4f53df3250c /indra/llrender/llcubemap.cpp
parent80eafe2ff3b235b6355ae2f20e8301374623e6ea (diff)
parenta5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (diff)
Merge downstream code
Diffstat (limited to 'indra/llrender/llcubemap.cpp')
-rwxr-xr-xindra/llrender/llcubemap.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp
index 0dad4285d9..45a3b18179 100755
--- a/indra/llrender/llcubemap.cpp
+++ b/indra/llrender/llcubemap.cpp
@@ -116,11 +116,6 @@ void LLCubeMap::initRawData(const std::vector<LLPointer<LLImageRaw> >& rawimages
const U8 *sd = rawimages[i]->getData();
U8 *td = mRawImages[i]->getData();
- if (!sd || !td)
- {
- continue;
- }
-
S32 offset = 0;
S32 sx, sy, so;
for (int y = 0; y < 64; y++)