diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
| commit | b9b4a4d9347053a3834ca2928063136948f09d1d (patch) | |
| tree | c2affaf017c2967989ff0b4a2b125d348736a04a /indra/newview/llstartup.cpp | |
| parent | 0a3b9e8e141a6f38ecbdf6020312e7a89b153bc4 (diff) | |
QAR-782 Merge featurettes batch #2
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 59b25acca4..07eada87ea 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -189,6 +189,8 @@ // exported globals // bool gAgentMovementCompleted = false; +std::string gInitialOutfit; +std::string gInitialOutfitGender; std::string SCREEN_HOME_FILENAME = "screen_home.bmp"; std::string SCREEN_LAST_FILENAME = "screen_last.bmp"; @@ -1607,6 +1609,9 @@ bool idle_startup() gFloaterMap->setVisible( gSavedSettings.getBOOL("ShowMiniMap") ); + LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0); + gViewerWindow->adjustControlRectanglesForFirstUse(window); + if (gSavedSettings.getBOOL("ShowCameraControls")) { LLFloaterCamera::showInstance(); @@ -2256,6 +2261,21 @@ bool idle_startup() LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender ); } + + // 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 + // the orientation island tutorial experience. JC + if (gAgent.isFirstLogin() + && !sInitialOutfit.empty() // registration set up an outfit + && !sInitialOutfitGender.empty() // and a gender + && gAgent.getAvatarObject() // can't wear clothes without object + && !gAgent.isGenderChosen() ) // nothing already loading + { + // Start loading the wearables, textures, gestures + LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender ); + } + // wait precache-delay and for agent's avatar or a lot longer. if(((timeout_frac > 1.f) && gAgent.getAvatarObject()) || (timeout_frac > 3.f)) |