diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-08-17 16:00:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-08-17 16:00:04 -0400 |
| commit | fe2eefd9139a860cd9ffa67ee5f148ba3922320c (patch) | |
| tree | d0395a805b44f525a5614bb2b3489d944555c170 /indra/newview/lllocalbitmaps.cpp | |
| parent | 4fb66604c9767bf518575963e9d4a871800bdeb3 (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
merge changes for 3.8.3-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(); |