diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2011-12-22 23:27:56 +0200 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2011-12-22 23:27:56 +0200 |
| commit | 62e77147b21bba59e7eda992f7f9c9052b6098d1 (patch) | |
| tree | c9080547896ad2a4391903bc6ee772ff97b9d310 /indra/newview | |
| parent | 0ccf2b5a1c08c897326c0ce47caa48e30ec4b5fa (diff) | |
EXP-1632 FIXED Added checking for valid agent avatar before selecting the avatar gender and loading the initial outfit.
Diffstat (limited to 'indra/newview')
| -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 |