summaryrefslogtreecommitdiff
path: root/indra/newview/tests/lllogininstance_test.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-07-09 08:39:22 -0700
committerOz Linden <oz@lindenlab.com>2013-07-09 08:39:22 -0700
commit34c77159f7dea117eb69fe013b09f2719b12e612 (patch)
tree881783048f392ba88297a3c8dbdd7f3ef8195f4d /indra/newview/tests/lllogininstance_test.cpp
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
CHOP-963: Make update service query url depend on the grid rather than settings
Diffstat (limited to 'indra/newview/tests/lllogininstance_test.cpp')
-rwxr-xr-xindra/newview/tests/lllogininstance_test.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index f038112fd0..f004e03a2d 100755
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -135,6 +135,7 @@ void LLGridManager::addSystemGrid(const std::string& label,
const std::string& login,
const std::string& helper,
const std::string& login_page,
+ const std::string& update_url_base,
const std::string& login_id)
{
}
@@ -208,9 +209,7 @@ std::string const & LLUpdaterService::pumpName(void)
return wakka;
}
bool LLUpdaterService::updateReadyToInstall(void) { return false; }
-void LLUpdaterService::initialize(const std::string& url,
- const std::string& path,
- const std::string& channel,
+void LLUpdaterService::initialize(const std::string& channel,
const std::string& version,
const std::string& platform,
const std::string& platform_version,