diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-07-21 13:26:48 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-07-21 13:26:48 -0700 |
| commit | c25105945a9d74e331cae4d827fc3be8d8915b7a (patch) | |
| tree | 894c4f663fecc5659e2e1afbe7a815fd0b921f4f /indra/newview/llstartup.cpp | |
| parent | f5c7d69317af103b5f5f762d7e0adb82f12a71b3 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 03d13018f6..5fcb5eef92 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2022,7 +2022,7 @@ bool idle_startup() { display_startup(); F32 timeout_frac = timeout.getElapsedTimeF32()/PRECACHING_DELAY; - + // We now have an inventory skeleton, so if this is a user's first // login, we can start setting up their clothing and avatar // appearance. This helps to avoid the generic "Ruth" avatar in @@ -2116,20 +2116,20 @@ bool idle_startup() && gAgentAvatarp->isFullyLoaded()) { LL_DEBUGS("Avatar") << "avatar fully loaded" << LL_ENDL; - LLStartUp::setStartupState( STATE_CLEANUP ); + LLStartUp::setStartupState( STATE_CLEANUP ); return TRUE; } } else { - // OK to just get the wearables + // OK to just get the wearables if ( gAgentWearables.areWearablesLoaded() ) - { - // We have our clothing, proceed. + { + // We have our clothing, proceed. LL_DEBUGS("Avatar") << "wearables loaded" << LL_ENDL; - LLStartUp::setStartupState( STATE_CLEANUP ); + LLStartUp::setStartupState( STATE_CLEANUP ); return TRUE; - } + } } //fall through this frame to STATE_CLEANUP } @@ -2820,6 +2820,7 @@ void LLStartUp::initNameCache() // capabilities for display name lookup LLAvatarNameCache::initClass(false,gSavedSettings.getBOOL("UsePeopleAPI")); LLAvatarNameCache::setUseDisplayNames(gSavedSettings.getBOOL("UseDisplayNames")); + LLAvatarNameCache::setUseUsernames(gSavedSettings.getBOOL("NameTagShowUsernames")); } void LLStartUp::cleanupNameCache() |