diff options
| author | David Seikel | 2011-03-20 17:02:40 +1000 |
|---|---|---|
| committer | David Seikel | 2011-03-20 17:02:40 +1000 |
| commit | 8c15fcec590c68337b8aa05d17793cd3c2a48068 (patch) | |
| tree | e233ecfa79c6fe22f47dc0eba44c0300dc0daa71 /linden/indra/llimage/llimage.cpp | |
| parent | The half arsed IRC support was broken. It's still not working, though it wor... (diff) | |
| parent | Merge remote-tracking branch 'jacek/exp' into exp (diff) | |
| download | meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.zip meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.gz meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.bz2 meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.xz | |
Merge remote-tracking branch 'mccabe/exp' into weekly
Conflicts: (Keeping these around as a record, there was some strangeness.
.gitignore
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llfloaterregioninfo.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/skins/default/html/en-us/loading-error/index.html
linden/indra/newview/skins/default/html/en-us/loading/loading.html
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/install.xml
Diffstat (limited to 'linden/indra/llimage/llimage.cpp')
| -rw-r--r-- | linden/indra/llimage/llimage.cpp | 2 |
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 | } |