diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
| commit | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (patch) | |
| tree | c1581bcf34e96a897c6e1d9a4aed95f353713baa /indra/newview/llstartup.cpp | |
| parent | 55c25229b79b1755c989e5996c8e8d118f369721 (diff) | |
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 1533ccf659..331d13d85d 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -294,7 +294,7 @@ void update_texture_fetch() } static std::vector<std::string> sAuthUris; -static int sAuthUriNum = -1; +static S32 sAuthUriNum = -1; // Returns FALSE to skip other idle processing. Should only return // TRUE when all initialization done. @@ -993,6 +993,7 @@ BOOL idle_startup() hashed_mac.hex_digest(hashed_mac_string); // TODO if statement here to use web_login_key + sAuthUriNum = llclamp(sAuthUriNum, 0, (S32)sAuthUris.size()-1); LLUserAuth::getInstance()->authenticate( sAuthUris[sAuthUriNum].c_str(), auth_method.c_str(), @@ -3601,7 +3602,15 @@ void init_start_screen(S32 location_id) } LLPointer<LLImageBMP> start_image_bmp = new LLImageBMP; - if( !start_image_bmp->load(temp_str) ) + + // Turn off start screen to get around the occasional readback + // driver bug + if(!gSavedSettings.getBOOL("UseStartScreen")) + { + llinfos << "Bitmap load disabled" << llendl; + return; + } + else if(!start_image_bmp->load(temp_str) ) { llinfos << "Bitmap load failed" << llendl; return; @@ -3610,8 +3619,9 @@ void init_start_screen(S32 location_id) gStartImageGL = new LLImageGL(FALSE); gStartImageWidth = start_image_bmp->getWidth(); gStartImageHeight = start_image_bmp->getHeight(); + LLPointer<LLImageRaw> raw = new LLImageRaw; - if (!start_image_bmp->decode(raw)) + if (!start_image_bmp->decode(raw, 0.0f)) { llinfos << "Bitmap decode failed" << llendl; gStartImageGL = NULL; |