diff options
author | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
commit | 98aabdc176c23de9ba23f902dc2015f9c775d26e (patch) | |
tree | 5ac6ffdb8e9be8d3c2a2f8b591c9971726c6b73c /indra/newview/llviewernetwork.cpp | |
parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
parent | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (diff) |
merge with release
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
-rwxr-xr-x | indra/newview/llviewernetwork.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index e7821d4b9e..faa58d423f 100755 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -550,7 +550,7 @@ std::string LLGridManager::getUpdateServiceURL() std::string update_url_base = gSavedSettings.getString("CmdLineUpdateService");; if ( !update_url_base.empty() ) { - LL_INFOS2("UpdaterService","GridManager") + LL_INFOS("UpdaterService","GridManager") << "Update URL base overridden from command line: " << update_url_base << LL_ENDL; } @@ -560,7 +560,7 @@ std::string LLGridManager::getUpdateServiceURL() } else { - LL_WARNS2("UpdaterService","GridManager") + LL_WARNS("UpdaterService","GridManager") << "The grid property '" << GRID_UPDATE_SERVICE_URL << "' is not defined for the grid '" << mGrid << "'" << LL_ENDL; |