diff options
| author | simon <none@none> | 2014-03-26 10:08:19 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-26 10:08:19 -0700 |
| commit | 70006f4a5651ebaa0362ec2f95b5dda13f72e5c7 (patch) | |
| tree | 6e1f7e8ccea28fa830bca7f2508a626f6ca907c9 /indra/newview/llnetmap.cpp | |
| parent | 73ef75498692e7b7cecb4960f4e308061917d86e (diff) | |
| parent | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (diff) | |
Pull in downstream -tiger, -bear, viewer-release and become version 3.7.5
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rwxr-xr-x | indra/newview/llnetmap.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 08b5eaedbb..193e2ea678 100755 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -798,7 +798,10 @@ void LLNetMap::createObjectImage() { mObjectRawImagep = new LLImageRaw(img_size, img_size, 4); U8* data = mObjectRawImagep->getData(); - memset( data, 0, img_size * img_size * 4 ); + if (data) + { + memset( data, 0, img_size * img_size * 4 ); + } mObjectImagep = LLViewerTextureManager::getLocalTexture( mObjectRawImagep.get(), FALSE); } setScale(mScale); |