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

Add the ability to turn off UDP fallback for HTTP texture fetch. From Ansariel Hiller.

meow-7.2.2
Tonya Souther 2011-04-26 12:12:21 -05:00
parent 4bcd2d9562
commit ebf38cdd8e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13577,7 +13577,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>ImagePipelineHTTPMaxFailCountFallback</key>
<map>
<key>Comment</key>
<string>Maximum failures during HTTP GET texture fetch per region before fallback to UDP fetch occurs.</string>
<string>Maximum failures during HTTP GET texture fetch per region before fallback to UDP fetch occurs. Set to 0 to disable automatic fallback.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>

3
indra/newview/lltexturefetch.cpp
View File

@ -2856,7 +2856,8 @@ void LLTextureFetch::setMaxHttpFailCountBeforeFallback(U32 maxFailCount)
bool LLTextureFetch::isHttpFailLimitReached()
{
return mTotalHttpFailCount >= mMaxHttpFailCountBeforeFallback;
return (mMaxHttpFailCountBeforeFallback > 0) &&
(mTotalHttpFailCount >= mMaxHttpFailCountBeforeFallback);
}
//////////////////////////////////////////////////////////////////////////////