livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-5222 WIP - checks for app shutting down a couple of places.

meow-7.2.2
Brad Payne (Vir Linden) 2015-05-18 13:10:26 -04:00
parent 618e10e821
commit e2544fabe5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llappearancemgr.cpp
View File

@ -528,7 +528,10 @@ LLUpdateAppearanceAndEditWearableOnDestroy::LLUpdateAppearanceAndEditWearableOnD
LLRequestServerAppearanceUpdateOnDestroy::~LLRequestServerAppearanceUpdateOnDestroy()
{
LL_DEBUGS("Avatar") << "ATT requesting server appearance update" << LL_ENDL;
LLAppearanceMgr::instance().requestServerAppearanceUpdate();
if (!LLApp::isExiting())
{
LLAppearanceMgr::instance().requestServerAppearanceUpdate();
}
}
void edit_wearable_and_customize_avatar(LLUUID item_id)

5
indra/newview/llattachmentsmgr.cpp
View File

@ -99,6 +99,11 @@ void LLAttachmentsMgr::onIdle()
return;
}
if (LLApp::isExiting())
{
return;
}
requestPendingAttachments();
linkRecentlyArrivedAttachments();