1 files changed, 4 insertions, 16 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index b8c9594aa7..890580ddff 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -69,7 +69,7 @@ const std::string MAIN_GRID_LOGIN_URI = "https://login.agni.lindenlab.com/cgi-bi
 
 const std::string SL_UPDATE_QUERY_URL = "https://update.secondlife.com/update";
 
-const std::string MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/";
+const std::string MAIN_GRID_SLURL_BASE = "https://maps.secondlife.com/secondlife/";
 const std::string SYSTEM_GRID_APP_SLURL_BASE = "secondlife:///app";
 
 const std::string MAIN_GRID_WEB_PROFILE_URL = "https://my.secondlife.com/";
@@ -281,7 +281,7 @@ bool LLGridManager::addGrid(LLSD& grid_data)
                 // Populate to the default values
                 if (!grid_data.has(GRID_LOGIN_PAGE_VALUE))
                 {
-                    grid_data[GRID_LOGIN_PAGE_VALUE] = std::string("http://") + grid + "/app/login/";
+                    grid_data[GRID_LOGIN_PAGE_VALUE] = std::string("https://") + grid + "/app/login/";
                 }
                 if (!grid_data.has(GRID_HELPER_URI_VALUE))
                 {
@@ -450,7 +450,7 @@ std::string LLGridManager::getGridLabel(const std::string& grid)
 {
     std::string grid_label;
     std::string grid_name = getGrid(grid);
-    if (!grid.empty())
+    if (!grid_name.empty())
     {
         grid_label = mGridList[grid_name][GRID_LABEL_VALUE].asString();
     }
@@ -466,7 +466,7 @@ std::string LLGridManager::getGridId(const std::string& grid)
 {
     std::string grid_id;
     std::string grid_name = getGrid(grid);
-    if (!grid.empty())
+    if (!grid_name.empty())
     {
         grid_id = mGridList[grid_name][GRID_ID_VALUE].asString();
     }
@@ -629,18 +629,6 @@ bool LLGridManager::isInProductionGrid()
     return mIsInProductionGrid;
 }
 
-bool LLGridManager::isInSecondlife()
-{
-    //return (isInSLMain() || isInSLBeta());
-    return true;
-}
-
-bool LLGridManager::isInOpenSim()
-{
-    // FIX THIS TO SUPPORT OPENSIM
-    return false;
-}
-
 bool LLGridManager::isSystemGrid(const std::string& grid)
 {
     std::string grid_name = getGrid(grid);