livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset: f2c6a8ac2edc - prep for http merge

meow-7.2.2
Tank_Master 2014-02-12 14:19:12 -08:00
parent 17923afeb4
commit 3ba22b76ae
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/app_settings/settings.xml
View File

@ -19594,17 +19594,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<string>Grey</string>
</map>
<key>FSMaxMeshRequestsPerSecond</key>
<map>
<key>Comment</key>
<string>The maximum number of mesh requests per second.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>100</integer>
</map>
<key>ExodusFlickrLastTags</key>
<map>
<key>Comment</key>
@ -20225,6 +20214,8 @@ Change of this parameter will affect the layout of buttons in notification toast
<integer>1</integer>
</map>
<!-- End: Prefs > Sound/Media => UI Sounds -->
=======
>>>>>>> other
<key>FSShowVoiceVisualizer</key>
<map>

16
indra/newview/llmeshrepository.cpp
View File

@ -76,8 +76,7 @@
LLMeshRepository gMeshRepo;
// <FS:Ansariel> Configurable request throttle
//const U32 MAX_MESH_REQUESTS_PER_SECOND = 100;
const U32 MAX_MESH_REQUESTS_PER_SECOND = 100;
// Maximum mesh version to support. Three least significant digits are reserved for the minor version,
// with major version changes indicating a format change that is not backwards compatible and should not
@ -579,9 +578,6 @@ void LLMeshRepoThread::run()
llwarns << "convex decomposition unable to be loaded" << llendl;
}
// <FS:Ansariel> Configurable request throttle
static LLCachedControl<U32> fsMaxMeshRequestsPerSecond(gSavedSettings, "FSMaxMeshRequestsPerSecond");
while (!LLApp::isQuitting())
{
mWaiting = true;
@ -602,10 +598,7 @@ void LLMeshRepoThread::run()
// NOTE: throttling intentionally favors LOD requests over header requests
// <FS:Ansariel> Configurable request throttle
//while (!mLODReqQ.empty() && count < MAX_MESH_REQUESTS_PER_SECOND && sActiveLODRequests < sMaxConcurrentRequests)
while (!mLODReqQ.empty() && count < (U32)fsMaxMeshRequestsPerSecond && sActiveLODRequests < sMaxConcurrentRequests)
// </FS:Ansariel> Configurable request throttle
while (!mLODReqQ.empty() && count < MAX_MESH_REQUESTS_PER_SECOND && sActiveLODRequests < sMaxConcurrentRequests)
{
if (mMutex)
{
@ -623,10 +616,7 @@ void LLMeshRepoThread::run()
}
}
// <FS:Ansariel> Configurable request throttle
//while (!mHeaderReqQ.empty() && count < MAX_MESH_REQUESTS_PER_SECOND && sActiveHeaderRequests < sMaxConcurrentRequests)
while (!mHeaderReqQ.empty() && count < (U32)fsMaxMeshRequestsPerSecond && sActiveHeaderRequests < sMaxConcurrentRequests)
// </FS:Ansariel> Configurable request throttle
while (!mHeaderReqQ.empty() && count < MAX_MESH_REQUESTS_PER_SECOND && sActiveHeaderRequests < sMaxConcurrentRequests)
{
if (mMutex)
{