diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-10-29 15:50:22 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-10-29 15:50:22 -0400 |
| commit | 2dbf6569a77c37d7c7ecc684dd417ddbbb7c6bab (patch) | |
| tree | f36b0286c261e8465ad9baa6adedb544a92ed9d6 | |
| parent | 81fecfa9f7e8664ec4f3bcf6662fe34d4e5d41a1 (diff) | |
SH-4586 WIP - possible fix for some COF mismatches
| -rwxr-xr-x | indra/newview/llstartup.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 61d0855119..d440ba246a 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -313,6 +313,12 @@ void update_texture_fetch() gTextureList.updateImages(0.10f); } +void set_flags_and_update_appearance() +{ + LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true); + LLAppearanceMgr::instance().updateAppearanceFromCOF(true, true, no_op); +} + // Returns false to skip other idle processing. Should only return // true when all initialization done. bool idle_startup() @@ -2039,12 +2045,9 @@ bool idle_startup() if (isAgentAvatarValid() && !gAgent.isFirstLogin() && !gAgent.isOutfitChosen()) { gAgentWearables.notifyLoadingStarted(); - callAfterCategoryFetch(LLAppearanceMgr::instance().getCOF(), - boost::bind(&LLAppearanceMgr::updateAppearanceFromCOF, - LLAppearanceMgr::getInstance(), true, true, no_op)); - LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true); gAgent.setOutfitChosen(TRUE); gAgentWearables.sendDummyAgentWearablesUpdate(); + callAfterCategoryFetch(LLAppearanceMgr::instance().getCOF(), set_flags_and_update_appearance); } display_startup(); |