Second Life viewer sources 1.19.1.3

1 files changed, 12 insertions, 2 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index c41c4ba..36809ee 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -293,7 +293,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.
@@ -1007,6 +1007,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);
                 gUserAuthp->authenticate(
                         sAuthUris[sAuthUriNum].c_str(),
                         auth_method.c_str(),
@@ -3619,7 +3620,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;
@@ -3628,6 +3637,7 @@ 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, 0.0f))
         {