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

EXT-7910 allow GPU and feature table to load from a custom location

meow-7.2.2
Karl Stiefvater (qarl) 2010-06-18 12:33:17 -05:00
parent 005986d19c
commit d0a8ae4557
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2840,6 +2840,17 @@
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FeatureManagerHTTPTable</key>
<map>
<key>Comment</key>
<string>Base directory for HTTP feature/gpu table fetches</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://viewer-settings.secondlife.com</string>
</map>
<key>FPSLogFrequency</key>
<map>

4
indra/newview/llfeaturemanager.cpp
View File

@ -496,11 +496,11 @@ private:
void fetch_table(std::string table)
{
const std::string base = "http://viewer-settings.s3.amazonaws.com/";
const std::string base = gSavedSettings.getString("FeatureManagerHTTPTable");
const std::string filename = llformat(table.c_str(), LLVersionInfo::getVersion().c_str());
const std::string url = base + filename;
const std::string url = base + "/" + filename;
const std::string path = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename);