diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-25 11:40:36 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-25 11:40:36 -0700 |
| commit | 96bb17f20bbcdc595f3a615a3129e134595b3a4a (patch) | |
| tree | e51e47f79b78a076e821360763196cc72c154aad /indra/newview/lllocalbitmaps.cpp | |
| parent | 7c61728b4bae928b2461f0f933dd1c1fa34ef0aa (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
Merge
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(); |