[sldev] [VWR] SVC-613 login handshake issue for optional update

[Joshua Bell]

Ettore Pasquini wrote:
> Are there any immediate workarounds for SVC-613?
>
> http://jira.secondlife.com/browse/SVC-613
>
> I have been building off of the Branch_1-18-3-Viewer branch for quite some
> time and never encountered the problem until today. I guess reverting to
> 1.18.1.* ?  I think 1.18.2 was a required update though, was it not?
>   
Assuming you're specifically asking about the "login handshake issue for 
optional update" part (VWR-613 is a mess, and appears to mention at 
least two distinct issues), then the workaround is to update to the 
latest code (1.18.3.5) which contains the fix. The relevant diff is:

Index: C:/linden/Branch_1-18-3-Viewer/indra/newview/llstartup.cpp
===================================================================
--- C:/linden/Branch_1-18-3-Viewer/indra/newview/llstartup.cpp    
(revision 69944)
+++ C:/linden/Branch_1-18-3-Viewer/indra/newview/llstartup.cpp    
(revision 69945)
@@ -2613,7 +2613,7 @@
 #if !LL_RELEASE_FOR_DOWNLOAD
     if (option == 2)
     {
-        LLStartUp::setStartupState( STATE_WORLD_INIT );
+        LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
         return;
     }
 #endif
@@ -2629,7 +2629,7 @@
         }
         else
         {
-            LLStartUp::setStartupState( STATE_WORLD_INIT );
+            LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
         }
         return;
     }