From c436d65919227f7bd1d5feb259aafe503a2cee9c Mon Sep 17 00:00:00 2001
From: Armin Weatherwax <arminweatherwax@lavabit.com>
Date: Tue, 7 Aug 2012 22:36:27 +0200
Subject: [PATCH] fix bad merge of llviewernetwork.*

---
 indra/newview/llviewernetwork.cpp | 16 +---------------
 indra/newview/llviewernetwork.h   |  3 ---
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index f61430ffc1..b1f348d6f6 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -63,7 +63,7 @@ const std::string DEFAULT_LOGIN_PAGE = "http://phoenixviewer.com/app/loginV3/";
 
 const std::string MAIN_GRID_LOGIN_URI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi";
 
-const std::string MAIN_GRID_LOGIN_URI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi";
+const std::string MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/";
 const std::string SYSTEM_GRID_APP_SLURL_BASE = "secondlife:///app";
 
 const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/";
@@ -312,20 +312,6 @@ bool LLGridManager::addGrid(LLSD& grid_data)
 			{
 				LL_WARNS("GridManager")<<"duplicate grid id'"<<grid_id<<"' ignored"<<LL_ENDL;
 			}
-			else
-			{
-				LL_WARNS("GridManager")<<"duplicate grid id'"<<grid_id<<"' ignored"<<LL_ENDL;
-			}
-		}
-		else
-		{
-			LL_WARNS("GridManager")<<"duplicate grid name '"<<grid<<"' ignored"<<LL_ENDL;
-		}
-	}
-	else
-	{
-		LL_WARNS("GridManager")<<"invalid value passed"<<LL_ENDL;
-	}
 		}
 		else
 		{
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h
index 9871fc4fa8..f7e8e01a25 100644
--- a/indra/newview/llviewernetwork.h
+++ b/indra/newview/llviewernetwork.h
@@ -123,9 +123,6 @@ class LLGridManager : public LLSingleton<LLGridManager>
 	 */
 	void getLoginURIs(const std::string& grid, std::vector<std::string>& uris);
 	
-	/// Get the login uris for the selected grid
-	void getLoginURIs(const std::string& grid, std::vector<std::string>& uris);
-	
 	/// Get the login uris for the selected grid
 	void getLoginURIs(std::vector<std::string>& uris);