Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'future' of https://github.com/siana/SingularityViewer

Browse Source
This commit is contained in:
TighMacFanatic
2011-10-05 20:17:24 -04:00
parent a1628abec3 5ef79d571b
commit ed8fad3fd9
152 changed files with 4311 additions and 3249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llstartup.cpp
View File

@@ -2743,7 +2743,7 @@ bool idle_startup()
if (gAgent.isFirstLogin()
&& !sInitialOutfit.empty() // registration set up an outfit
&& !sInitialOutfitGender.empty() // and a gender
&& gAgent.getAvatarObject() // can't wear clothes without object
&& gAgentAvatarp // can't wear clothes without object
&& !gAgent.isGenderChosen() ) // nothing already loading
{
// Start loading the wearables, textures, gestures
@@ -2758,7 +2758,7 @@ bool idle_startup()
if (gAgent.isFirstLogin()
&& !sInitialOutfit.empty() // registration set up an outfit
&& !sInitialOutfitGender.empty() // and a gender
&& gAgent.getAvatarObject() // can't wear clothes without object
&& gAgentAvatarp // can't wear clothes without object
&& !gAgent.isGenderChosen() ) // nothing already loading
{
// Start loading the wearables, textures, gestures
@@ -2766,7 +2766,7 @@ bool idle_startup()
}
// wait precache-delay and for agent's avatar or a lot longer.
if(((timeout_frac > 1.f) && gAgent.getAvatarObject())
if(((timeout_frac > 1.f) && gAgentAvatarp)
|| (timeout_frac > 3.f))
{
LLStartUp::setStartupState( STATE_WEARABLES_WAIT );
@@ -2822,8 +2822,8 @@ bool idle_startup()
if (gAgent.isFirstLogin())
{
// wait for avatar to be completely loaded
if (gAgent.getAvatarObject()
&& gAgent.getAvatarObject()->isFullyLoaded())
if (gAgentAvatarp
&& gAgentAvatarp->isFullyLoaded())
{
//llinfos << "avatar fully loaded" << llendl;
LLStartUp::setStartupState( STATE_CLEANUP );