summaryrefslogtreecommitdiff
path: root/indra/llrender/llcubemap.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/llrender/llcubemap.cpp
parent114084bb80d4991519e2ca4020823319810c64b2 (diff)
parent0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (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++)