diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 12:06:09 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 12:06:09 -0700 |
| commit | 9488baada3c0aec7cfa4256708fdda82861cd502 (patch) | |
| tree | 1f71293b54161733269a6f340574ec4960623d0f /indra/newview/tests/lllogininstance_test.cpp | |
| parent | de08d74dc6da594c20aed3673114cbc0ef6d3305 (diff) | |
| parent | 1869a399beb2cb3fa52d21f9c288f4c3b6ab4deb (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview/tests/lllogininstance_test.cpp')
| -rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index 9e321db889..b7e81c4199 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -114,8 +114,9 @@ LLGridManager::~LLGridManager() { } -void LLGridManager::addGrid(LLSD& grid_data) +bool LLGridManager::addGrid(LLSD& grid_data) { + return true; } LLGridManager::LLGridManager() : @@ -136,7 +137,7 @@ void LLGridManager::addSystemGrid(const std::string& label, const std::string& login_id) { } -std::map<std::string, std::string> LLGridManager::getKnownGrids(bool favorite_only) +std::map<std::string, std::string> LLGridManager::getKnownGrids() { std::map<std::string, std::string> result; return result; @@ -151,8 +152,6 @@ bool LLGridManager::isInProductionGrid() return false; } -void LLGridManager::saveFavorites() -{} std::string LLGridManager::getSLURLBase(const std::string& grid_name) { return "myslurl"; |