diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-19 15:49:48 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-19 15:49:48 -0500 |
| commit | 7e9ba401d1489ef96c5315f03332f28d62d97899 (patch) | |
| tree | c2eabeb3f4f635ae49e5a3e9b07da54dad30eee2 /indra/newview/llstartup.cpp | |
| parent | 2abb1a81c56a27eab02157851cb9e67730231bb6 (diff) | |
| parent | 4c5141c5677a2e98c1331026d4e119abee6ab2ae (diff) | |
reconciled .hgtags
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 36d6ff3ef2..7e02a41e7e 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2026,7 +2026,7 @@ bool idle_startup() const F32 wearables_time = wearables_timer.getElapsedTimeF32(); const F32 MAX_WEARABLES_TIME = 10.f; - if (!gAgent.isGenderChosen()) + if (!gAgent.isGenderChosen() && isAgentAvatarValid()) { // No point in waiting for clothing, we don't even // know what gender we are. Pop a dialog to ask and @@ -2541,6 +2541,12 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name, gender = SEX_FEMALE; } + if (!isAgentAvatarValid()) + { + llwarns << "Trying to load an initial outfit for an invalid agent avatar" << llendl; + return; + } + gAgentAvatarp->setSex(gender); // try to find the outfit - if not there, create some default |