Merge LGPL post HTTP merge default tip

Wed, 26 Feb 2014 00:19:24 -0800

author
Tank_Master
date
Wed, 26 Feb 2014 00:19:24 -0800
changeset 40773
73c94a97d46d
parent 40772
b88580036ef2
parent 40770
20d1ea15d94e

Merge LGPL post HTTP merge

.hgtags file | annotate | diff | revisions
autobuild.xml file | annotate | diff | revisions
indra/edit-me-to-trigger-new-build.txt file | annotate | diff | revisions
indra/llcommon/CMakeLists.txt file | annotate | diff | revisions
indra/llcorehttp/_httpoprequest.cpp file | annotate | diff | revisions
indra/llmessage/llcurl.cpp file | annotate | diff | revisions
indra/newview/CMakeLists.txt file | annotate | diff | revisions
indra/newview/VIEWER_VERSION.txt file | annotate | diff | revisions
indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/llmeshrepository.cpp file | annotate | diff | revisions
indra/newview/lltexturefetch.cpp file | annotate | diff | revisions
indra/newview/lltexturefetch.h file | annotate | diff | revisions
indra/newview/lltextureview.cpp file | annotate | diff | revisions
indra/newview/llviewerregion.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/en/notifications.xml file | annotate | diff | revisions
     1.1 --- a/indra/edit-me-to-trigger-new-build.txt	Tue Feb 25 23:30:50 2014 -0800
     1.2 +++ b/indra/edit-me-to-trigger-new-build.txt	Wed Feb 26 00:19:24 2014 -0800
     1.3 @@ -1,1 +1,2 @@
     1.4  2014-02-25 10:34
     1.5 +
     2.1 --- a/indra/newview/CMakeLists.txt	Tue Feb 25 23:30:50 2014 -0800
     2.2 +++ b/indra/newview/CMakeLists.txt	Wed Feb 26 00:19:24 2014 -0800
     2.3 @@ -2466,7 +2466,7 @@
     2.4      set(VIEWER_COPY_MANIFEST copy_l_viewer_manifest)
     2.5    endif (LINUX)
     2.6  
     2.7 -  if( RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING )
     2.8 +  if( (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND NOT ND_BUILD64BIT_ARCH )
     2.9    if(CMAKE_CFG_INTDIR STREQUAL ".")
    2.10        set(LLBUILD_CONFIG ${CMAKE_BUILD_TYPE})
    2.11    else(CMAKE_CFG_INTDIR STREQUAL ".")
    2.12 @@ -2490,7 +2490,7 @@
    2.13    add_custom_target(generate_breakpad_symbols DEPENDS "${VIEWER_SYMBOL_FILE}")
    2.14    add_dependencies(generate_breakpad_symbols "${VIEWER_BINARY_NAME}" "${VIEWER_COPY_MANIFEST}")
    2.15    add_dependencies(package generate_breakpad_symbols)
    2.16 -  endif( RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING )
    2.17 +  endif( (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND NOT ND_BUILD64BIT_ARCH )
    2.18  endif (PACKAGE)
    2.19  
    2.20  if (LL_TESTS)
     3.1 --- a/indra/newview/app_settings/settings.xml	Tue Feb 25 23:30:50 2014 -0800
     3.2 +++ b/indra/newview/app_settings/settings.xml	Wed Feb 26 00:19:24 2014 -0800
     3.3 @@ -12630,6 +12630,14 @@
     3.4      <string>U32</string>
     3.5      <key>Value</key>
     3.6      <integer>8</integer>
     3.7 +    <key>SanityCheckType</key>
     3.8 +    <string>LessThan</string>
     3.9 +    <key>SanityValue</key>
    3.10 +    <array>
    3.11 +      <integer>13</integer>
    3.12 +    </array>
    3.13 +    <key>SanityComment</key>
    3.14 +    <string>Setting this value too high will make it less likely that mesh objects will load correctly and cause performace degradation for you and others in the same region.</string>
    3.15    </map>
    3.16    <key>MeshMaxConcurrentRequests</key>
    3.17    <map>
    3.18 @@ -12664,6 +12672,28 @@
    3.19      <key>Value</key>
    3.20      <boolean>0</boolean>
    3.21    </map>
    3.22 +  <key>MeshUseHttpRetryAfter</key>
    3.23 +  <map>
    3.24 +    <key>Comment</key>
    3.25 +    <string>If TRUE, use Retry-After response headers when rescheduling a mesh request that fails with an HTTP 503 status.  Static.</string>
    3.26 +    <key>Persist</key>
    3.27 +    <integer>1</integer>
    3.28 +    <key>Type</key>
    3.29 +    <string>Boolean</string>
    3.30 +    <key>Value</key>
    3.31 +    <boolean>1</boolean>
    3.32 +  </map>
    3.33 +  <key>MeshUseGetMesh1</key>
    3.34 +  <map>
    3.35 +    <key>Comment</key>
    3.36 +    <string>If TRUE, use the legacy GetMesh capability for mesh download requests.  Semi-dynamic (read at region crossings).</string>
    3.37 +    <key>Persist</key>
    3.38 +    <integer>1</integer>
    3.39 +    <key>Type</key>
    3.40 +    <string>Boolean</string>
    3.41 +    <key>Value</key>
    3.42 +    <boolean>0</boolean>
    3.43 +  </map>
    3.44     <key>RunMultipleThreads</key>
    3.45      <map>
    3.46        <key>Comment</key>
    3.47 @@ -20279,9 +20309,6 @@
    3.48        <integer>1</integer>
    3.49      </map>
    3.50      <!-- End: Prefs > Sound/Media => UI Sounds -->
    3.51 -=======
    3.52 ->>>>>>> other
    3.53 -  
    3.54      <key>FSShowVoiceVisualizer</key>
    3.55      <map>
    3.56        <key>Comment</key>
     4.1 --- a/indra/newview/llmeshrepository.cpp	Tue Feb 25 23:30:50 2014 -0800
     4.2 +++ b/indra/newview/llmeshrepository.cpp	Wed Feb 26 00:19:24 2014 -0800
     4.3 @@ -377,6 +377,11 @@
     4.4  // See wiki at https://wiki.secondlife.com/wiki/Mesh/Mesh_Asset_Format
     4.5  const S32 MAX_MESH_VERSION = 999;
     4.6  
     4.7 +//<FS:TS> FIRE-11451: Cap concurrent mesh requests at a sane value 
     4.8 +const U32 MESH_CONCURRENT_REQUEST_LIMIT = 64;  // upper limit 
     4.9 +const U32 MESH2_CONCURRENT_REQUEST_LIMIT = 32;  // upper limit 
    4.10 +//</FS:TS> FIRE-11451 
    4.11 +
    4.12  U32 LLMeshRepository::sBytesReceived = 0;
    4.13  U32 LLMeshRepository::sMeshRequestCount = 0;
    4.14  U32 LLMeshRepository::sHTTPRequestCount = 0;
    4.15 @@ -2969,7 +2974,6 @@
    4.16  {
    4.17  		llassert(mProcessed);
    4.18  }
    4.19 -
    4.20  void LLMeshPhysicsShapeHandler::processFailure(LLCore::HttpStatus status)
    4.21  {
    4.22  	LL_WARNS(LOG_MESH) << "Error during mesh physics shape handling.  ID:  " << mMeshID
    4.23 @@ -3199,7 +3203,20 @@
    4.24  		// <FS:Ansariel> Use faster LLCachedControls for frequently visited locations
    4.25  		//LLMeshRepoThread::sMaxConcurrentRequests = gSavedSettings.getU32("MeshMaxConcurrentRequests");
    4.26  		static LLCachedControl<U32> meshMaxConcurrentRequests(gSavedSettings, "MeshMaxConcurrentRequests");
    4.27 -		LLMeshRepoThread::sMaxConcurrentRequests = (U32)meshMaxConcurrentRequests;
    4.28 +		//<FS:TS> FIRE-11451: Cap concurrent requests at a sane value
    4.29 +		if (meshMaxConcurrentRequests() > MESH_CONCURRENT_REQUEST_LIMIT) 
    4.30 +		{
    4.31 +			U32 mesh_max_concurrent_requests_default = gSavedSettings.getControl("MeshMaxConcurrentRequests")->getDefault().asInteger();
    4.32 +			LLSD args; 
    4.33 +			args["VALUE"] = llformat("%d", meshMaxConcurrentRequests()); 
    4.34 +			args["MAX"] = llformat("%d", MESH_CONCURRENT_REQUEST_LIMIT); 
    4.35 +			args["DEFAULT"] = llformat("%d", mesh_max_concurrent_requests_default);
    4.36 +			args["DEBUGNAME"] = "MeshMaxConccurrentRequests";
    4.37 +			LLNotificationsUtil::add("MeshMaxConcurrentReqTooHigh", args); 
    4.38 +			gSavedSettings.setU32("MeshMaxConcurrentRequests", mesh_max_concurrent_requests_default);
    4.39 +		}
    4.40 +		//</FS:TS> FIRE-11451 
    4.41 +		LLMeshRepoThread::sMaxConcurrentRequests = meshMaxConcurrentRequests();
    4.42  		// </FS:Ansariel>
    4.43  		LLMeshRepoThread::sRequestHighWater = llclamp(2 * S32(LLMeshRepoThread::sMaxConcurrentRequests),
    4.44  													  REQUEST_HIGH_WATER_MIN,
    4.45 @@ -3212,7 +3229,24 @@
    4.46  	{
    4.47  		// GetMesh2 operation with keepalives, etc.  With pipelining,
    4.48  		// we'll increase this.
    4.49 -		LLMeshRepoThread::sMaxConcurrentRequests = gSavedSettings.getU32("Mesh2MaxConcurrentRequests");
    4.50 +		// <FS:TM> Use faster LLCachedControls for frequently visited locations
    4.51 +		//LLMeshRepoThread::sMaxConcurrentRequests = gSavedSettings.getU32("Mesh2MaxConcurrentRequests");
    4.52 +		static LLCachedControl<U32> mesh2MaxConcurrentRequests(gSavedSettings, "Mesh2MaxConcurrentRequests");
    4.53 +		//<FS:TS> FIRE-11451: Cap concurrent requests at a sane value
    4.54 +		if (mesh2MaxConcurrentRequests() > MESH2_CONCURRENT_REQUEST_LIMIT) 
    4.55 +		{ 
    4.56 +			U32 mesh2_max_concurrent_requests_default = gSavedSettings.getControl("Mesh2MaxConcurrentRequests")->getDefault().asInteger();
    4.57 +			LLSD args; 
    4.58 +			args["VALUE"] = llformat("%d", mesh2MaxConcurrentRequests()); 
    4.59 +			args["MAX"] = llformat("%d", MESH2_CONCURRENT_REQUEST_LIMIT); 
    4.60 +			args["DEFAULT"] = llformat("%d", mesh2_max_concurrent_requests_default);
    4.61 +			args["DEBUGNAME"] = "Mesh2MaxConccurrentRequests";
    4.62 +			LLNotificationsUtil::add("MeshMaxConcurrentReqTooHigh", args); 
    4.63 +			gSavedSettings.setU32("Mesh2MaxConcurrentRequests", mesh2_max_concurrent_requests_default);
    4.64 +		}
    4.65 +		//</FS:TS> FIRE-11451 
    4.66 +		LLMeshRepoThread::sMaxConcurrentRequests = mesh2MaxConcurrentRequests();
    4.67 +		// </FS:TM>
    4.68  		LLMeshRepoThread::sRequestHighWater = llclamp(5 * S32(LLMeshRepoThread::sMaxConcurrentRequests),
    4.69  													  REQUEST2_HIGH_WATER_MIN,
    4.70  													  REQUEST2_HIGH_WATER_MAX);
    4.71 @@ -4281,6 +4315,7 @@
    4.72  	}
    4.73  }
    4.74  
    4.75 +
    4.76  void LLPhysicsDecomp::run()
    4.77  {
    4.78  	LLConvexDecomposition* decomp = LLConvexDecomposition::getInstance();
     5.1 --- a/indra/newview/lltextureview.cpp	Tue Feb 25 23:30:50 2014 -0800
     5.2 +++ b/indra/newview/lltextureview.cpp	Wed Feb 26 00:19:24 2014 -0800
     5.3 @@ -548,8 +548,8 @@
     5.4  	//, cache_entries, cache_max_entries
     5.5  
     5.6  	// <FS:Ansariel> Texture memory bars
     5.7 -	//LLFontGL::getFontMonospace()->renderUTF8(text, 0, 0, v_offset + line_height*4,
     5.8 -	LLFontGL::getFontMonospace()->renderUTF8(text, 0, 0, v_offset + line_height*5,
     5.9 +	//LLFontGL::getFontMonospace()->renderUTF8(text, 0, 0, v_offset + line_height*5,
    5.10 +	LLFontGL::getFontMonospace()->renderUTF8(text, 0, 0, v_offset + line_height*6,
    5.11  	// </FS:Ansariel>
    5.12  											 text_color, LLFontGL::LEFT, LLFontGL::TOP);
    5.13  
    5.14 @@ -557,7 +557,7 @@
    5.15  	S32 bar_left = 0;
    5.16  	S32 bar_width = 200;
    5.17  	S32 bar_space = 32;
    5.18 -	S32 top = line_height*4 - 2 + v_offset;
    5.19 +	S32 top = line_height*5 - 2 + v_offset;
    5.20  	S32 bottom = top - 6;
    5.21  	S32 left = bar_left;
    5.22  	S32 right = left + bar_width;
    5.23 @@ -569,7 +569,7 @@
    5.24  		
    5.25  	left = bar_left;
    5.26  	text = "GL";
    5.27 -	LLFontGL::getFontMonospace()->renderUTF8(text, 0, left, v_offset + line_height*4,
    5.28 +	LLFontGL::getFontMonospace()->renderUTF8(text, 0, left, v_offset + line_height*5,
    5.29  											 text_color, LLFontGL::LEFT, LLFontGL::TOP);
    5.30  	
    5.31  	left = bar_left+20;
    5.32 @@ -597,7 +597,7 @@
    5.33  
    5.34  	left = bar_left;
    5.35  	text = "Bound";
    5.36 -	LLFontGL::getFontMonospace()->renderUTF8(text, 0, left, v_offset + line_height*4,
    5.37 +	LLFontGL::getFontMonospace()->renderUTF8(text, 0, left, v_offset + line_height*5,
    5.38  									 text_color, LLFontGL::LEFT, LLFontGL::TOP);
    5.39  	left = bar_left + 42;
    5.40  	right = left + bar_width;
    5.41 @@ -637,13 +637,11 @@
    5.42  	LLFontGL::getFontMonospace()->renderUTF8(text, 0, 0, v_offset + line_height*4,
    5.43  											 text_color, LLFontGL::LEFT, LLFontGL::TOP);
    5.44  
    5.45 -	// <FS:Ansariel> Texture memory bars
    5.46 -	//S32 left = 0 ;
    5.47  	//----------------------------------------------------------------------------
    5.48  
    5.49  	// <FS:Ansariel> Fast cache stats
    5.50 -	//text = llformat("Textures: %d Fetch: %d(%d) Pkts:%d(%d) Cache R/W: %d/%d LFS:%d RAW:%d HTP:%d DEC:%d CRE:%d",
    5.51 -	text = llformat("Tex: %d Fetch: %d(%d) Pkts:%d(%d) CAC R/W: %d/%d LFS:%d RAW:%d HTP:%d DEC:%d CRE:%d FCA:%d",
    5.52 +	//text = llformat("Textures: %d Fetch: %d(%d) Pkts:%d(%d) Cache R/W: %d/%d LFS:%d RAW:%d HTP:%d DEC:%d CRE:%d ",
    5.53 +	text = llformat("Tex: %d Fetch: %d(%d) Pkts:%d(%d) CAC R/W: %d/%d LFS:%d RAW:%d HTP:%d DEC:%d CRE:%d FCA:%d ",
    5.54  	// </FS:Ansariel>
    5.55  					gTextureList.getNumImages(),
    5.56  					LLAppViewer::getTextureFetch()->getNumRequests(), LLAppViewer::getTextureFetch()->getNumDeletes(),
    5.57 @@ -666,7 +664,6 @@
    5.58  											 &x_right, FALSE);
    5.59  
    5.60  	// <FS:Ansariel> Move BW figures further to the right to prevent overlapping
    5.61 -	//left = 550;
    5.62  	left = 575;
    5.63  	F32 bandwidth = LLAppViewer::getTextureFetch()->getTextureBandwidth();
    5.64  	// <FS:Ansariel> Speed-up
    5.65 @@ -733,8 +730,8 @@
    5.66  {
    5.67  	LLRect rect;
    5.68  	// <FS:Ansariel> Texture memory bars
    5.69 -	//rect.mTop = 50; //LLFontGL::getFontMonospace()->getLineHeight() * 6;
    5.70 -	rect.mTop = 65;
    5.71 +	//rect.mTop = 68; //LLFontGL::getFontMonospace()->getLineHeight() * 6;
    5.72 +	rect.mTop = 83;
    5.73  	// </FS:Ansariel>
    5.74  	return rect;
    5.75  }
     6.1 --- a/indra/newview/skins/default/xui/de/notifications.xml	Tue Feb 25 23:30:50 2014 -0800
     6.2 +++ b/indra/newview/skins/default/xui/de/notifications.xml	Wed Feb 26 00:19:24 2014 -0800
     6.3 @@ -4707,7 +4707,7 @@
     6.4  	</notification>
     6.5  
     6.6  	<notification name="MeshMaxConcurrentReqTooHigh">
     6.7 -Der Wert, der für das gleichzeitige Laden von Mesh-Objekten gesetzt wurde ([VALUE]), ist höher als das Maximum von [MAX]. Er wurde auf den Standardwert [DEFAULT] zurückgesetzt.
     6.8 +Der Wert, der für das gleichzeitige Laden von Mesh-Objekten gesetzt wurde ([VALUE]; Debug-Einstellung [DEBUGNAME]), ist höher als das Maximum von [MAX]. Er wurde auf den Standardwert [DEFAULT] zurückgesetzt.
     6.9  	</notification>
    6.10  
    6.11  	<notification name="SkinDefaultsChangeSettings">
     7.1 --- a/indra/newview/skins/default/xui/de/strings.xml	Tue Feb 25 23:30:50 2014 -0800
     7.2 +++ b/indra/newview/skins/default/xui/de/strings.xml	Wed Feb 26 00:19:24 2014 -0800
     7.3 @@ -5524,10 +5524,10 @@
     7.4  		Die Einstellung &quot;[CONTROL_NAME]&quot; sollte nicht den Wert [VALUE_1] haben.
     7.5  	</string>
     7.6  	<string name="SanityCheckLessThan">
     7.7 -		Die Einstellung &quot;[CONTROL_NAME]&quot; sollte keinen Wert kleiner als [VALUE_1] haben.
     7.8 +		Die Einstellung &quot;[CONTROL_NAME]&quot; sollte einen Wert kleiner als [VALUE_1] haben.
     7.9  	</string>
    7.10  	<string name="SanityCheckGreaterThan">
    7.11 -		Die Einstellung &quot;[CONTROL_NAME]&quot; sollte keinen Wert größer als [VALUE_1] haben.
    7.12 +		Die Einstellung &quot;[CONTROL_NAME]&quot; sollte einen Wert größer als [VALUE_1] haben.
    7.13  	</string>
    7.14  	<string name="SanityCheckBetween">
    7.15  		Die Einstellung &quot;[CONTROL_NAME]&quot; sollte einen Wert zwischen [VALUE_1] und [VALUE_2] haben.
     8.1 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml	Tue Feb 25 23:30:50 2014 -0800
     8.2 +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml	Wed Feb 26 00:19:24 2014 -0800
     8.3 @@ -586,7 +586,6 @@
     8.4      </button>
     8.5      <scroll_list
     8.6       draw_stripes="false"
     8.7 -     bg_writeable_color="MouseGray"
     8.8       follows="all"
     8.9       height="145"
    8.10       layout="topleft"
     9.1 --- a/indra/newview/skins/default/xui/en/notifications.xml	Tue Feb 25 23:30:50 2014 -0800
     9.2 +++ b/indra/newview/skins/default/xui/en/notifications.xml	Wed Feb 26 00:19:24 2014 -0800
     9.3 @@ -11568,6 +11568,14 @@
     9.4        <tag>Export</tag>
     9.5  		Successfully saved [OBJECT] to [FILENAME].
     9.6      </notification>
     9.7 +
     9.8 +    <notification
     9.9 +     icon="alertmodal.tga"
    9.10 +     name="MeshMaxConcurrentReqTooHigh"
    9.11 +     type="alertmodal">
    9.12 +The value you set, [VALUE], for the number of concurrent requests to load mesh objects (debug setting [DEBUGNAME]) is higher than the maximum of [MAX]. It has been reset to the default of [DEFAULT].
    9.13 +    <tag>fail</tag>
    9.14 +    </notification>
    9.15  	
    9.16      <notification
    9.17       icon="alertmodal.tga"
    10.1 --- a/indra/newview/skins/default/xui/pl/notifications.xml	Tue Feb 25 23:30:50 2014 -0800
    10.2 +++ b/indra/newview/skins/default/xui/pl/notifications.xml	Wed Feb 26 00:19:24 2014 -0800
    10.3 @@ -4517,6 +4517,9 @@
    10.4  	<notification name="ExportColladaSuccess">
    10.5  		Zapisano z powodzeniem [OBJECT] do [FILENAME].
    10.6  	</notification>
    10.7 +	<notification name="MeshMaxConcurrentReqTooHigh">	
    10.8 +		Wartość ustawienia ([VALUE]) dla liczby jednoczesnych żądań ładowania obiektów meszowych określona przez Ciebie (ustawienie debugowania [DEBUGNAME]) jest wyższa niż dopuszczalne [MAX]. Została ona zresetowana do domyślnej, [DEFAULT].
    10.9 +	</notification>
   10.10  	<notification name="ImportSuccess">
   10.11  		Pomyślnie zaimportowano [COUNT] [OBJECT].
   10.12  	</notification>
   10.13 @@ -4529,9 +4532,6 @@
   10.14  	<notification name="AntiSpamChatNewLineFloodBlocked">
   10.15  		Antyspam: Zablokowano [SOURCE] za wysłanie wiadomości czatu mającej więcej niż [COUNT] linii.
   10.16  	</notification>
   10.17 -	<notification name="MeshMaxConcurrentReqTooHigh">
   10.18 -		Wartość ustawienia dla liczby jednoczesnych żądań ładowania obiektów meszowych określona przez Ciebie, [VALUE], jest wyższa niż dopuszczalne [MAX]. Została ona zresetowana do domyślnej, [DEFAULT].
   10.19 -	</notification>
   10.20  	<notification name="SkinDefaultsChangeSettings">
   10.21  		[MESSAGE]
   10.22  		<form name="form">

mercurial