aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/llimage/llimage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index e933750..3a8dc3b 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -269,7 +269,7 @@ LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components)
269 : LLImageBase() 269 : LLImageBase()
270{ 270{
271 mMemType = LLMemType::MTYPE_IMAGERAW; 271 mMemType = LLMemType::MTYPE_IMAGERAW;
272 if(allocateDataSize(width, height, components)) 272 if(allocateDataSize(width, height, components) && data)
273 { 273 {
274 memcpy(getData(), data, width*height*components); 274 memcpy(getData(), data, width*height*components);
275 } 275 }