From 59b1026d523e8fae883df3e98708f82196258d9d Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Fri, 7 Aug 2015 19:46:33 -0400
Subject: [PATCH] More tweaks to local appearance handling
---
indra/newview/llstartup.cpp | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 733bc7d906..0987ad7fd5 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2144,25 +2144,21 @@ bool idle_startup()
display_startup();
- if ((LLGridManager::getInstance()->isInSecondlife() && gAgent.isOutfitChosen() && (wearables_time > max_wearables_time)) ||
- (!LLGridManager::getInstance()->isInSecondlife() && (wearables_time > max_wearables_time)))
+ if (gAgent.isOutfitChosen() && (wearables_time > max_wearables_time))
{
LLNotificationsUtil::add("ClothingLoading");
record(LLStatViewer::LOADING_WEARABLES_LONG_DELAY, wearables_time);
LLStartUp::setStartupState( STATE_CLEANUP );
}
+ // wait for avatar to be completely loaded
else if (gAgent.isFirstLogin()
&& isAgentAvatarValid()
&& gAgentAvatarp->isFullyLoaded())
{
- // wait for avatar to be completely loaded
- if (isAgentAvatarValid()
- && gAgentAvatarp->isFullyLoaded())
- {
- LL_DEBUGS("Avatar") << "avatar fully loaded" << LL_ENDL;
- LLStartUp::setStartupState( STATE_CLEANUP );
- return TRUE;
- }
+
+ LL_DEBUGS("Avatar") << "avatar fully loaded" << LL_ENDL;
+ LLStartUp::setStartupState( STATE_CLEANUP );
+ return TRUE;
}
else
{
--
GitLab