1 files changed, 10 insertions, 7 deletions

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 426b71ba67..470e512694 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1962,8 +1962,10 @@ bool idle_startup()
             display_startup();
             return FALSE;
         }
+
         LLInventoryModelBackgroundFetch::instance().start();
-        LLUUID cof_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+        LLAppearanceMgr::instance().initCOFID();
+        LLUUID cof_id = LLAppearanceMgr::instance().getCOF();
         LLViewerInventoryCategory* cof = gInventory.getCategory(cof_id);
         if (cof
             && cof->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
@@ -2274,7 +2276,7 @@ bool idle_startup()
         static LLFrameTimer wearables_timer;
 
         const F32 wearables_time = wearables_timer.getElapsedTimeF32();
-        static LLCachedControl<F32> max_wearables_time(gSavedSettings, "ClothingLoadingDelay");
+        const F32 MAX_WEARABLES_TIME = 10.f;
 
         if (!gAgent.isOutfitChosen() && isAgentAvatarValid())
         {
@@ -2293,7 +2295,7 @@ bool idle_startup()
 
         display_startup();
 
-        if (gAgent.isOutfitChosen() && (wearables_time > max_wearables_time))
+        if (gAgent.isOutfitChosen() && (wearables_time > MAX_WEARABLES_TIME))
         {
             if (gInventory.isInventoryUsable())
             {
@@ -2713,14 +2715,11 @@ void register_viewer_callbacks(LLMessageSystem* msg)
         LLViewerParcelMgr::processParcelDwellReply);
 
     msg->setHandlerFunc("AvatarPropertiesReply",
-                        &LLAvatarPropertiesProcessor::processAvatarPropertiesReply);
+                        &LLAvatarPropertiesProcessor::processAvatarLegacyPropertiesReply);
     msg->setHandlerFunc("AvatarInterestsReply",
                         &LLAvatarPropertiesProcessor::processAvatarInterestsReply);
     msg->setHandlerFunc("AvatarGroupsReply",
                         &LLAvatarPropertiesProcessor::processAvatarGroupsReply);
-    // ratings deprecated
-    //msg->setHandlerFuncFast(_PREHASH_AvatarStatisticsReply,
-    //                  LLPanelAvatar::processAvatarStatisticsReply);
     msg->setHandlerFunc("AvatarNotesReply",
                         &LLAvatarPropertiesProcessor::processAvatarNotesReply);
     msg->setHandlerFunc("AvatarPicksReply",
@@ -2881,6 +2880,7 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
     LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true);
     // Initiate creation of COF, since we're also bypassing that.
     gInventory.ensureCategoryForTypeExists(LLFolderType::FT_CURRENT_OUTFIT);
+    LLAppearanceMgr::getInstance()->initCOFID();
 
     ESex gender;
     if (gender_name == "male")
@@ -2994,6 +2994,8 @@ std::string LLStartUp::startupStateToString(EStartupState state)
         RTNENUM( STATE_AGENT_WAIT );
         RTNENUM( STATE_INVENTORY_SEND );
         RTNENUM(STATE_INVENTORY_CALLBACKS );
+        RTNENUM( STATE_INVENTORY_SKEL );
+        RTNENUM( STATE_INVENTORY_SEND2 );
         RTNENUM( STATE_MISC );
         RTNENUM( STATE_PRECACHE );
         RTNENUM( STATE_WEARABLES_WAIT );
@@ -3036,6 +3038,7 @@ void reset_login()
     gAgent.cleanup();
     gSky.cleanup(); // mVOSkyp is an inworld object.
     LLWorld::getInstance()->resetClass();
+    LLAppearanceMgr::getInstance()->cleanup();
 
     if ( gViewerWindow )
     {   // Hide menus and normal buttons