All submissions to this site are governed by the Second Life Viewer Contribution Agreement. By submitting patches and other information using this site, you acknowledge that you have read, understood, and agreed to those terms.

Review Board 1.6.11

Welcome to the Second Life Viewer Code Review tool.
See the documentation on our wiki for how to use this site.

Remove the fallback to v1.0 update query

Review Request #619 - Created July 30, 2013 and updated

Oz Linden Reviewers
chop-975 nat_linden
None viewer-release 
while I was at it, I took out a line that stores the channel string in a setting that is not defined... it causes a WARN log entry on every startup
Ran a local Mac build, confirmed that the 404 response (which is normal for a local build since the Second Life Test channel is not defined in the VVM), and confirmed that it did not fall back but did retry at the correct time.
indra/newview/llappviewer.cpp
Revision 421c20423df9 New Change
... 2353 lines hidden [Expand] 
bool LLAppViewer::initConfiguration()
2354 
		OSMessageBox(msg.str(),LLStringUtil::null,OSMB_OK);
 2354 
		OSMessageBox(msg.str(),LLStringUtil::null,OSMB_OK);
2355 
		return false;
 2355 
		return false;
2356 
	}
 2356 
	}
2357 

   		
   2357
   
    

   		

  


  


   2358


   
    
	initStrings(); // setup paths for LLTrans based on settings files only

   		
   2358
   
    
	initStrings(); // setup paths for LLTrans based on settings files only

   		

  


  


   2359


   
    
	// - set procedural settings

   		
   2359
   
    
	// - set procedural settings

   		

  


  


   2360


   
    
	// Note: can't use LL_PATH_PER_SL_ACCOUNT for any of these since we haven't logged in yet

   		
   2360
   
    
	// Note: can't use LL_PATH_PER_SL_ACCOUNT for any of these since we haven't logged in yet

   		

  


  


   2361


   
    
	gSavedSettings.setString("ClientSettingsFile", 

   		
   2361
   
    
	gSavedSettings.setString("ClientSettingsFile", 

   		

  


  


   2362


   
    
        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));

   		
   2362
   
    
        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));

   		

  


  


   2363


   
    

   		
   2363
   
    

   		

  


 



 

  


   2364


   
    
	gSavedSettings.setString("VersionChannelName", LLVersionInfo::getChannel());

   		
   
   
    

   		

  


  


   2365


   
    

   		
   
   
    

   		

  


 



 

  


   2366


   
    
#ifndef	LL_RELEASE_FOR_DOWNLOAD

   		
   2364
   
    
#ifndef	LL_RELEASE_FOR_DOWNLOAD

   		

  


  


   2367


   
    
	// provide developer build only overrides for these control variables that are not

   		
   2365
   
    
	// provide developer build only overrides for these control variables that are not

   		

  


  


   2368


   
    
	// persisted to settings.xml

   		
   2366
   
    
	// persisted to settings.xml

   		

  


  


   2369


   
    
	LLControlVariable* c = gSavedSettings.getControl("ShowConsoleWindow");

   		
   2367
   
    
	LLControlVariable* c = gSavedSettings.getControl("ShowConsoleWindow");

   		

  


  


   2370


   
    
	if (c)

   		
   2368
   
    
	if (c)

   		

  


  


   2371


   
    
	{

   		
   2369
   
    
	{

   		

  


  


   2372


   
    
		c->setValue(true, false);

   		
   2370
   
    
		c->setValue(true, false);

   		

  


  


   2373


   
    
	}

   		
   2371
   
    
	}

   		

  


  


   2374


   
    
	c = gSavedSettings.getControl("AllowMultipleViewers");

   		
   2372
   
    
	c = gSavedSettings.getControl("AllowMultipleViewers");

   		

  


  


   2375


   
    
	if (c)

   		
   2373
   
    
	if (c)

   		

  


 



 
  

   ...
   3237 lines hidden [Expand]
   
  


 

















 
  

   indra/viewer_components/updater/llupdatechecker.cpp
  

  

   Revision 421c20423df9
   New Change
  

 
 
  
 

 









    

 
  1. indra/newview/llappviewer.cpp:
  Loading...
 
    2. 

 
  2. indra/viewer_components/updater/llupdatechecker.cpp:
  Loading...
 
    3.