diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 11:24:33 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 11:24:33 -0700 |
| commit | b088449517c7070ba15b6e344dbc7a1145f64dac (patch) | |
| tree | 66562b72586081f59fa74e9baaedf560ff49ffd5 /indra/newview/llfeaturemanager.cpp | |
| parent | 4bf8a0c7fca329ce1d0c58bc3ebf86fbbe544d40 (diff) | |
| parent | bb95afc9e1246abfc3656b31b33d1e5ae1dc85f2 (diff) | |
Merge from ssh://hg.lindenlab.com/dessie/viewer-release
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 4fdb010162..f32fcd6b7f 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -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); |