diff options
| author | callum_linden <none@none> | 2015-08-31 11:17:28 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-08-31 11:17:28 -0700 |
| commit | 1db2c7276d0bb1039ad8be9240201732ad5387cd (patch) | |
| tree | a2bc6f6f80772cc459f23a075ba3bc0b75b5de48 /indra/newview/lllocalbitmaps.cpp | |
| parent | 0ad81961cd5aea97231959fd31daa22dd2d8908a (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/newview/lllocalbitmaps.cpp')
| -rwxr-xr-x | indra/newview/lllocalbitmaps.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index 1380345164..4e9947fca0 100755 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -128,7 +128,7 @@ LLLocalBitmap::LLLocalBitmap(std::string filename) LLLocalBitmap::~LLLocalBitmap() { // replace IDs with defaults, if set to do so. - if(LL_LOCAL_REPLACE_ON_DEL && mValid) // fix for STORM-1837 + if(LL_LOCAL_REPLACE_ON_DEL && mValid && gAgentAvatarp) // fix for STORM-1837 { replaceIDs(mWorldID, IMG_DEFAULT); LLLocalBitmapMgr::doRebake(); |