Backed out changeset: 991c0303923d - prep for http merge

Wed, 12 Feb 2014 13:52:32 -0800

author
Tank_Master
date
Wed, 12 Feb 2014 13:52:32 -0800
changeset 40752
ff2fee6e8ffd
parent 40751
0f89023606a9
child 40753
1a146f745b7e

Backed out changeset: 991c0303923d - prep for http merge

indra/newview/llmeshrepository.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/en/notifications.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/llmeshrepository.cpp	Wed Feb 12 13:40:30 2014 -0800
     1.2 +++ b/indra/newview/llmeshrepository.cpp	Wed Feb 12 13:52:32 2014 -0800
     1.3 @@ -2625,11 +2625,6 @@
     1.4  	//<FS:TS> FIRE-11451: Cap concurrent requests at a sane value
     1.5  	if ((U32)meshMaxConcurrentRequests > MESH_CONCURRENT_REQUEST_LIMIT)
     1.6  	{
     1.7 -		LLSD args;
     1.8 -		args["VALUE"] = llformat("%d", (U32)meshMaxConcurrentRequests);
     1.9 -		args["MAX"] = llformat("%d", MESH_CONCURRENT_REQUEST_LIMIT);
    1.10 -		args["DEFAULT"] = llformat("%d", MESH_CONCURRENT_REQUEST_RESET);
    1.11 -		LLNotificationsUtil::add("MeshMaxConcurrentReqTooHigh", args);
    1.12  		gSavedSettings.setU32("MeshMaxConcurrentRequests",MESH_CONCURRENT_REQUEST_RESET);
    1.13  	}
    1.14  	//</FS:TS> FIRE-11451
     2.1 --- a/indra/newview/skins/default/xui/en/notifications.xml	Wed Feb 12 13:40:30 2014 -0800
     2.2 +++ b/indra/newview/skins/default/xui/en/notifications.xml	Wed Feb 12 13:52:32 2014 -0800
     2.3 @@ -11575,14 +11575,6 @@
     2.4  AntiSpam: Blocked [SOURCE] for sending a chat message with more than [COUNT] lines.
     2.5      </notification>
     2.6  
     2.7 -    <notification
     2.8 -     icon="alertmodal.tga"
     2.9 -     name="MeshMaxConcurrentReqTooHigh"
    2.10 -     type="alertmodal">
    2.11 -The value you set for the number of concurrent requests to load mesh objects, [VALUE], is higher than the maximum of [MAX]. It has been reset to the default of [DEFAULT].
    2.12 -    <tag>fail</tag>
    2.13 -    </notification>
    2.14 -
    2.15    <!-- <FS:Zi> Notification template for changed settings when selecting certain skins -->
    2.16    <!--         The actual texts for the messages are in strings.xml -->
    2.17    <notification

mercurial