SH-3860. Cloud on first load issue. I'm sure the inaccessible jira has more details...
This commit is contained in:
@@ -4332,9 +4332,10 @@ public:
|
||||
<< llendl;
|
||||
//dec_busy_count();
|
||||
gInventory.removeObserver(this);
|
||||
doOnIdleOneTime(mCallable);
|
||||
|
||||
// lets notify observers that loading is finished.
|
||||
gAgentWearables.notifyLoadingFinished();
|
||||
//gAgentWearables.notifyLoadingFinished();
|
||||
delete this;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -3255,12 +3255,17 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
|
||||
}
|
||||
else
|
||||
{
|
||||
// FIXME SH-3860 - this creates a race condition, where COF
|
||||
// changes (base outfit link added) after appearance update
|
||||
// request has been submitted.
|
||||
sWearablesLoadedCon = gAgentWearables.addLoadedCallback(LLStartUp::saveInitialOutfit);
|
||||
|
||||
bool do_copy = true;
|
||||
bool do_append = false;
|
||||
LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id);
|
||||
LLAppearanceMgr::instance().wearInventoryCategory(cat, do_copy, do_append);
|
||||
// Need to fetch cof contents before we can wear.
|
||||
callAfterCategoryFetch(LLAppearanceMgr::instance().getCOF(),
|
||||
boost::bind(&LLAppearanceMgr::wearInventoryCategory, LLAppearanceMgr::getInstance(), cat, do_copy, do_append));
|
||||
lldebugs << "initial outfit category id: " << cat_id << llendl;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user