diff options
author | Oz Linden <oz@lindenlab.com> | 2015-08-18 15:05:01 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-08-18 15:05:01 -0400 |
commit | 2efe91ef64a963ef488d6018d04196753fe815ca (patch) | |
tree | 09b198468fcc4b7a9405e68f355413aafde1d1b9 /indra/newview/lllocalbitmaps.cpp | |
parent | dff79705eddd4ce92fbb3d8a3b3b47a734b4837b (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(); |