Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 9e321db889..7705b4c567 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -60,6 +60,7 @@ static LLEventStream gTestPump("test_pump");
 #include "../llslurl.h"
 #include "../llstartup.h"
 LLSLURL LLStartUp::sStartSLURL;
+LLSLURL& LLStartUp::getStartSLURL() { return sStartSLURL; }
 
 #include "lllogin.h"
 
@@ -114,8 +115,9 @@ LLGridManager::~LLGridManager()
 {
 }
 
-void LLGridManager::addGrid(LLSD& grid_data)
+bool LLGridManager::addGrid(LLSD& grid_data)
 {
+	return true;
 }
 LLGridManager::LLGridManager()
 :
@@ -136,7 +138,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 +153,6 @@ bool LLGridManager::isInProductionGrid()
 	return false;
 }
 
-void LLGridManager::saveFavorites()
-{}
 std::string LLGridManager::getSLURLBase(const std::string& grid_name)
 {
 	return "myslurl";