From 1b68f71348ecf3983b76b40d7940da8377f049b7 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Mon, 29 Apr 2024 07:43:28 +0300
Subject: #824 Process source files in bulk: replace tabs with spaces, convert
 CRLF to LF, and trim trailing whitespaces as needed

---
 indra/newview/llviewernetwork.cpp | 950 +++++++++++++++++++-------------------
 1 file changed, 475 insertions(+), 475 deletions(-)

(limited to 'indra/newview/llviewernetwork.cpp')

diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index be05ac0d3a..16ddc2f89c 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -79,18 +79,18 @@ const char* DEFAULT_SLURL_BASE = "https://%s/region/";
 const char* DEFAULT_APP_SLURL_BASE = "x-grid-location-info://%s/app";
 
 LLGridManager::LLGridManager()
-:	mIsInProductionGrid(false)
+:   mIsInProductionGrid(false)
 {
-	// by default, we use the 'grids.xml' file in the user settings directory
-	// this file is an LLSD file containing multiple grid definitions.
-	// This file does not contain definitions for secondlife.com grids,
-	// as that would be a security issue when they are overwritten by
-	// an attacker.  Don't want someone snagging a password.
-	std::string grid_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
-														   "grids.xml");
-	LL_DEBUGS("GridManager")<<LL_ENDL;
+    // by default, we use the 'grids.xml' file in the user settings directory
+    // this file is an LLSD file containing multiple grid definitions.
+    // This file does not contain definitions for secondlife.com grids,
+    // as that would be a security issue when they are overwritten by
+    // an attacker.  Don't want someone snagging a password.
+    std::string grid_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
+                                                           "grids.xml");
+    LL_DEBUGS("GridManager")<<LL_ENDL;
 
-	initialize(grid_file);
+    initialize(grid_file);
 
 }
 
@@ -107,136 +107,136 @@ LLGridManager::LLGridManager()
 // and the grids.xml file
 void LLGridManager::initialize(const std::string& grid_file)
 {
-	// default grid list.
-	// Don't move to a modifiable file for security reasons,
-	mGrid.clear() ;
-
-	// set to undefined
-	mGridList = LLSD();
-	mGridFile = grid_file;
-	// as we don't want an attacker to override our grid list
-	// to point the default grid to an invalid grid
-  	addSystemGrid(LLTrans::getString("AgniGridLabel"),
-				  MAINGRID,
-				  MAIN_GRID_LOGIN_URI,
-				  "https://secondlife.com/helpers/",
-				  DEFAULT_LOGIN_PAGE,
-				  SL_UPDATE_QUERY_URL,
-				  MAIN_GRID_WEB_PROFILE_URL,
-				  "Agni");
-	addSystemGrid(LLTrans::getString("AditiGridLabel"),
-				  "util.aditi.lindenlab.com",
-				  "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
-				  "https://secondlife.aditi.lindenlab.com/helpers/",
-				  DEFAULT_LOGIN_PAGE,
-				  SL_UPDATE_QUERY_URL,
-				  "https://my.secondlife-beta.com/",
-				  "Aditi");
-
-	LLSD other_grids;
-	llifstream llsd_xml;
-	if (!grid_file.empty())
-	{
-		LL_INFOS("GridManager")<<"Grid configuration file '"<<grid_file<<"'"<<LL_ENDL;
-		llsd_xml.open( grid_file.c_str(), std::ios::in | std::ios::binary );
-
-		// parse through the gridfile, inserting grids into the list unless
-		// they overwrite an existing grid.
-		if( llsd_xml.is_open())
-		{
-			LLSDSerialize::fromXMLDocument( other_grids, llsd_xml );
-			if(other_grids.isMap())
-			{
-				for(LLSD::map_iterator grid_itr = other_grids.beginMap();
-					grid_itr != other_grids.endMap();
-					++grid_itr)
-				{
-					LLSD::String key_name = grid_itr->first;
-					LLSD grid = grid_itr->second;
-
-					std::string existingGrid = getGrid(grid);
-					if (mGridList.has(key_name) || !existingGrid.empty())
-					{
-						LL_WARNS("GridManager") << "Cannot override existing grid '" << key_name << "'; ignoring definition from '"<<grid_file<<"'" << LL_ENDL;
-					}
-					else if ( addGrid(grid) )
-					{
-						LL_INFOS("GridManager") << "added grid '"<<key_name<<"'"<<LL_ENDL;
-					}
-					else
-					{
-						LL_WARNS("GridManager") << "failed to add invalid grid '"<<key_name<<"'"<<LL_ENDL;
-					}
-				}
-				llsd_xml.close();
-			}
-			else
-			{
-				LL_WARNS("GridManager")<<"Failed to parse grid configuration '"<<grid_file<<"'"<<LL_ENDL;
-			}
-		}
-		else
-		{
-			LL_WARNS("GridManager")<<"Failed to open grid configuration '"<<grid_file<<"'"<<LL_ENDL;
-		}
-	}
-	else
-	{
-		LL_DEBUGS("GridManager")<<"no grid file specified"<<LL_ENDL;
-	}
-
-	// load a grid from the command line.
-	// if the actual grid name is specified from the command line,
-	// set it as the 'selected' grid.
-	std::string cmd_line_grid = gSavedSettings.getString("CmdLineGridChoice");
-	if(!cmd_line_grid.empty())
-	{
-		// try to find the grid assuming the command line parameter is
-		// the case-insensitive 'label' of the grid.  ie 'Agni'
-		mGrid = getGrid(cmd_line_grid);
-		if(mGrid.empty())
-		{
-			LL_WARNS("GridManager")<<"Unknown grid '"<<cmd_line_grid<<"'"<<LL_ENDL;
-		}
-		else
-		{
-			LL_INFOS("GridManager")<<"Command line specified '"<<cmd_line_grid<<"': "<<mGrid<<LL_ENDL;
-		}
-	}
-	else
-	{
-		// if a grid was not passed in via the command line, grab it from the CurrentGrid setting.
-		// if there's no current grid, that's ok as it'll be either set by the value passed
-		// in via the login uri if that's specified, or will default to maingrid
-		std::string last_grid = gSavedSettings.getString("CurrentGrid");
-		if ( ! getGrid(last_grid).empty() )
-		{
-			LL_INFOS("GridManager")<<"Using last grid: "<<last_grid<<LL_ENDL;
-			mGrid = last_grid;
-		}
-		else
-		{
-			LL_INFOS("GridManager")<<"Last grid '"<<last_grid<<"' not configured"<<LL_ENDL;
-		}
-	}
-
-	if(mGrid.empty())
-	{
-		// no grid was specified so default to maingrid
-		LL_INFOS("GridManager") << "Default grid to "<<MAINGRID<< LL_ENDL;
-		mGrid = MAINGRID;
-	}
-
-	LLControlVariablePtr grid_control = gSavedSettings.getControl("CurrentGrid");
-	if (grid_control.notNull())
-	{
-		grid_control->getSignal()->connect(boost::bind(&LLGridManager::updateIsInProductionGrid, this));
-	}
-
-	// since above only triggers on changes, trigger the callback manually to initialize state
-	updateIsInProductionGrid();
-
-	setGridChoice(mGrid);
+    // default grid list.
+    // Don't move to a modifiable file for security reasons,
+    mGrid.clear() ;
+
+    // set to undefined
+    mGridList = LLSD();
+    mGridFile = grid_file;
+    // as we don't want an attacker to override our grid list
+    // to point the default grid to an invalid grid
+    addSystemGrid(LLTrans::getString("AgniGridLabel"),
+                  MAINGRID,
+                  MAIN_GRID_LOGIN_URI,
+                  "https://secondlife.com/helpers/",
+                  DEFAULT_LOGIN_PAGE,
+                  SL_UPDATE_QUERY_URL,
+                  MAIN_GRID_WEB_PROFILE_URL,
+                  "Agni");
+    addSystemGrid(LLTrans::getString("AditiGridLabel"),
+                  "util.aditi.lindenlab.com",
+                  "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
+                  "https://secondlife.aditi.lindenlab.com/helpers/",
+                  DEFAULT_LOGIN_PAGE,
+                  SL_UPDATE_QUERY_URL,
+                  "https://my.secondlife-beta.com/",
+                  "Aditi");
+
+    LLSD other_grids;
+    llifstream llsd_xml;
+    if (!grid_file.empty())
+    {
+        LL_INFOS("GridManager")<<"Grid configuration file '"<<grid_file<<"'"<<LL_ENDL;
+        llsd_xml.open( grid_file.c_str(), std::ios::in | std::ios::binary );
+
+        // parse through the gridfile, inserting grids into the list unless
+        // they overwrite an existing grid.
+        if( llsd_xml.is_open())
+        {
+            LLSDSerialize::fromXMLDocument( other_grids, llsd_xml );
+            if(other_grids.isMap())
+            {
+                for(LLSD::map_iterator grid_itr = other_grids.beginMap();
+                    grid_itr != other_grids.endMap();
+                    ++grid_itr)
+                {
+                    LLSD::String key_name = grid_itr->first;
+                    LLSD grid = grid_itr->second;
+
+                    std::string existingGrid = getGrid(grid);
+                    if (mGridList.has(key_name) || !existingGrid.empty())
+                    {
+                        LL_WARNS("GridManager") << "Cannot override existing grid '" << key_name << "'; ignoring definition from '"<<grid_file<<"'" << LL_ENDL;
+                    }
+                    else if ( addGrid(grid) )
+                    {
+                        LL_INFOS("GridManager") << "added grid '"<<key_name<<"'"<<LL_ENDL;
+                    }
+                    else
+                    {
+                        LL_WARNS("GridManager") << "failed to add invalid grid '"<<key_name<<"'"<<LL_ENDL;
+                    }
+                }
+                llsd_xml.close();
+            }
+            else
+            {
+                LL_WARNS("GridManager")<<"Failed to parse grid configuration '"<<grid_file<<"'"<<LL_ENDL;
+            }
+        }
+        else
+        {
+            LL_WARNS("GridManager")<<"Failed to open grid configuration '"<<grid_file<<"'"<<LL_ENDL;
+        }
+    }
+    else
+    {
+        LL_DEBUGS("GridManager")<<"no grid file specified"<<LL_ENDL;
+    }
+
+    // load a grid from the command line.
+    // if the actual grid name is specified from the command line,
+    // set it as the 'selected' grid.
+    std::string cmd_line_grid = gSavedSettings.getString("CmdLineGridChoice");
+    if(!cmd_line_grid.empty())
+    {
+        // try to find the grid assuming the command line parameter is
+        // the case-insensitive 'label' of the grid.  ie 'Agni'
+        mGrid = getGrid(cmd_line_grid);
+        if(mGrid.empty())
+        {
+            LL_WARNS("GridManager")<<"Unknown grid '"<<cmd_line_grid<<"'"<<LL_ENDL;
+        }
+        else
+        {
+            LL_INFOS("GridManager")<<"Command line specified '"<<cmd_line_grid<<"': "<<mGrid<<LL_ENDL;
+        }
+    }
+    else
+    {
+        // if a grid was not passed in via the command line, grab it from the CurrentGrid setting.
+        // if there's no current grid, that's ok as it'll be either set by the value passed
+        // in via the login uri if that's specified, or will default to maingrid
+        std::string last_grid = gSavedSettings.getString("CurrentGrid");
+        if ( ! getGrid(last_grid).empty() )
+        {
+            LL_INFOS("GridManager")<<"Using last grid: "<<last_grid<<LL_ENDL;
+            mGrid = last_grid;
+        }
+        else
+        {
+            LL_INFOS("GridManager")<<"Last grid '"<<last_grid<<"' not configured"<<LL_ENDL;
+        }
+    }
+
+    if(mGrid.empty())
+    {
+        // no grid was specified so default to maingrid
+        LL_INFOS("GridManager") << "Default grid to "<<MAINGRID<< LL_ENDL;
+        mGrid = MAINGRID;
+    }
+
+    LLControlVariablePtr grid_control = gSavedSettings.getControl("CurrentGrid");
+    if (grid_control.notNull())
+    {
+        grid_control->getSignal()->connect(boost::bind(&LLGridManager::updateIsInProductionGrid, this));
+    }
+
+    // since above only triggers on changes, trigger the callback manually to initialize state
+    updateIsInProductionGrid();
+
+    setGridChoice(mGrid);
 }
 
 LLGridManager::~LLGridManager()
@@ -250,432 +250,432 @@ LLGridManager::~LLGridManager()
 
 bool LLGridManager::addGrid(LLSD& grid_data)
 {
-	bool added = false;
-	if (grid_data.isMap() && grid_data.has(GRID_VALUE))
-	{
-		std::string grid = utf8str_tolower(grid_data[GRID_VALUE].asString());
-
-		if ( getGrid(grid_data[GRID_VALUE]).empty() && getGrid(grid).empty() )
-		{
-			std::string grid_id = grid_data.has(GRID_ID_VALUE) ? grid_data[GRID_ID_VALUE].asString() : "";
-			if ( getGrid(grid_id).empty() )
-			{
-				// populate the other values if they don't exist
-				if (!grid_data.has(GRID_LABEL_VALUE))
-				{
-					grid_data[GRID_LABEL_VALUE] = grid;
-				}
-				if (!grid_data.has(GRID_ID_VALUE))
-				{
-					grid_data[GRID_ID_VALUE] = grid;
-				}
-
-				// if the grid data doesn't include any of the URIs, then
-				// generate them from the grid, which should be a dns address
-				if (!grid_data.has(GRID_LOGIN_URI_VALUE))
-				{
-					grid_data[GRID_LOGIN_URI_VALUE] = LLSD::emptyArray();
-					grid_data[GRID_LOGIN_URI_VALUE].append(std::string("https://") +
-														   grid + "/cgi-bin/login.cgi");
-				}
-				// 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/";
-				}
-				if (!grid_data.has(GRID_HELPER_URI_VALUE))
-				{
-					grid_data[GRID_HELPER_URI_VALUE] = std::string("https://") + grid + "/helpers/";
-				}
-				if (!grid_data.has(GRID_WEB_PROFILE_VALUE))
-				{
-					grid_data[GRID_WEB_PROFILE_VALUE] = std::string("https://") + grid + "/";
-				}
-
-				if (!grid_data.has(GRID_LOGIN_IDENTIFIER_TYPES))
-				{
-					// non system grids and grids that haven't already been configured with values
-					// get both types of credentials.
-					grid_data[GRID_LOGIN_IDENTIFIER_TYPES] = LLSD::emptyArray();
-					grid_data[GRID_LOGIN_IDENTIFIER_TYPES].append(CRED_IDENTIFIER_TYPE_AGENT);
-					grid_data[GRID_LOGIN_IDENTIFIER_TYPES].append(CRED_IDENTIFIER_TYPE_ACCOUNT);
-				}
-
-				LL_DEBUGS("GridManager") <<grid<<"\n"
-										 <<"  id:          "<<grid_data[GRID_ID_VALUE].asString()<<"\n"
-										 <<"  label:       "<<grid_data[GRID_LABEL_VALUE].asString()<<"\n"
-										 <<"  login page:  "<<grid_data[GRID_LOGIN_PAGE_VALUE].asString()<<"\n"
-										 <<"  helper page: "<<grid_data[GRID_HELPER_URI_VALUE].asString()<<"\n"
-										 <<"  web profile: "<<grid_data[GRID_WEB_PROFILE_VALUE].asString()<<"\n";
-				/* still in LL_DEBUGS */ 
-				for (LLSD::array_const_iterator login_uris = grid_data[GRID_LOGIN_URI_VALUE].beginArray();
-					 login_uris != grid_data[GRID_LOGIN_URI_VALUE].endArray();
-					 login_uris++)
-				{
-					LL_CONT << "  login uri:   "<<login_uris->asString()<<"\n";
-				}
-				LL_CONT << LL_ENDL;
-				mGridList[grid] = grid_data;
-				added = true;
-			}
-			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 grid definition ignored"<<LL_ENDL;
-	}
-	return added;
+    bool added = false;
+    if (grid_data.isMap() && grid_data.has(GRID_VALUE))
+    {
+        std::string grid = utf8str_tolower(grid_data[GRID_VALUE].asString());
+
+        if ( getGrid(grid_data[GRID_VALUE]).empty() && getGrid(grid).empty() )
+        {
+            std::string grid_id = grid_data.has(GRID_ID_VALUE) ? grid_data[GRID_ID_VALUE].asString() : "";
+            if ( getGrid(grid_id).empty() )
+            {
+                // populate the other values if they don't exist
+                if (!grid_data.has(GRID_LABEL_VALUE))
+                {
+                    grid_data[GRID_LABEL_VALUE] = grid;
+                }
+                if (!grid_data.has(GRID_ID_VALUE))
+                {
+                    grid_data[GRID_ID_VALUE] = grid;
+                }
+
+                // if the grid data doesn't include any of the URIs, then
+                // generate them from the grid, which should be a dns address
+                if (!grid_data.has(GRID_LOGIN_URI_VALUE))
+                {
+                    grid_data[GRID_LOGIN_URI_VALUE] = LLSD::emptyArray();
+                    grid_data[GRID_LOGIN_URI_VALUE].append(std::string("https://") +
+                                                           grid + "/cgi-bin/login.cgi");
+                }
+                // 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/";
+                }
+                if (!grid_data.has(GRID_HELPER_URI_VALUE))
+                {
+                    grid_data[GRID_HELPER_URI_VALUE] = std::string("https://") + grid + "/helpers/";
+                }
+                if (!grid_data.has(GRID_WEB_PROFILE_VALUE))
+                {
+                    grid_data[GRID_WEB_PROFILE_VALUE] = std::string("https://") + grid + "/";
+                }
+
+                if (!grid_data.has(GRID_LOGIN_IDENTIFIER_TYPES))
+                {
+                    // non system grids and grids that haven't already been configured with values
+                    // get both types of credentials.
+                    grid_data[GRID_LOGIN_IDENTIFIER_TYPES] = LLSD::emptyArray();
+                    grid_data[GRID_LOGIN_IDENTIFIER_TYPES].append(CRED_IDENTIFIER_TYPE_AGENT);
+                    grid_data[GRID_LOGIN_IDENTIFIER_TYPES].append(CRED_IDENTIFIER_TYPE_ACCOUNT);
+                }
+
+                LL_DEBUGS("GridManager") <<grid<<"\n"
+                                         <<"  id:          "<<grid_data[GRID_ID_VALUE].asString()<<"\n"
+                                         <<"  label:       "<<grid_data[GRID_LABEL_VALUE].asString()<<"\n"
+                                         <<"  login page:  "<<grid_data[GRID_LOGIN_PAGE_VALUE].asString()<<"\n"
+                                         <<"  helper page: "<<grid_data[GRID_HELPER_URI_VALUE].asString()<<"\n"
+                                         <<"  web profile: "<<grid_data[GRID_WEB_PROFILE_VALUE].asString()<<"\n";
+                /* still in LL_DEBUGS */
+                for (LLSD::array_const_iterator login_uris = grid_data[GRID_LOGIN_URI_VALUE].beginArray();
+                     login_uris != grid_data[GRID_LOGIN_URI_VALUE].endArray();
+                     login_uris++)
+                {
+                    LL_CONT << "  login uri:   "<<login_uris->asString()<<"\n";
+                }
+                LL_CONT << LL_ENDL;
+                mGridList[grid] = grid_data;
+                added = true;
+            }
+            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 grid definition ignored"<<LL_ENDL;
+    }
+    return added;
 }
 
 //
 // LLGridManager::addSystemGrid - helper for adding a system grid.
 void LLGridManager::addSystemGrid(const std::string& label,
-								  const std::string& name,
-								  const std::string& login_uri,
-								  const std::string& helper,
-								  const std::string& login_page,
-								  const std::string& update_url_base,
-								  const std::string& web_profile_url,
-								  const std::string& login_id)
+                                  const std::string& name,
+                                  const std::string& login_uri,
+                                  const std::string& helper,
+                                  const std::string& login_page,
+                                  const std::string& update_url_base,
+                                  const std::string& web_profile_url,
+                                  const std::string& login_id)
 {
-	LLSD grid = LLSD::emptyMap();
-	grid[GRID_VALUE] = name;
-	grid[GRID_LABEL_VALUE] = label;
-	grid[GRID_HELPER_URI_VALUE] = helper;
-	grid[GRID_LOGIN_URI_VALUE] = LLSD::emptyArray();
-	grid[GRID_LOGIN_URI_VALUE].append(login_uri);
-	grid[GRID_LOGIN_PAGE_VALUE] = login_page;
-	grid[GRID_UPDATE_SERVICE_URL] = update_url_base;
-	grid[GRID_WEB_PROFILE_VALUE] = web_profile_url;
-	grid[GRID_IS_SYSTEM_GRID_VALUE] = true;
-	grid[GRID_LOGIN_IDENTIFIER_TYPES] = LLSD::emptyArray();
-	grid[GRID_LOGIN_IDENTIFIER_TYPES].append(CRED_IDENTIFIER_TYPE_AGENT);
-
-	grid[GRID_APP_SLURL_BASE] = SYSTEM_GRID_APP_SLURL_BASE;
-	if (login_id.empty())
-	{
-		grid[GRID_ID_VALUE] = name;
-	}
-	else
-	{
-		grid[GRID_ID_VALUE] = login_id;
-	}
-
-	if (name == std::string(MAINGRID))
-	{
-		grid[GRID_SLURL_BASE] = MAIN_GRID_SLURL_BASE;
-	}
-	else
-	{
-		grid[GRID_SLURL_BASE] = llformat(SYSTEM_GRID_SLURL_BASE, grid[GRID_ID_VALUE].asString().c_str());
-	}
-
-	addGrid(grid);
+    LLSD grid = LLSD::emptyMap();
+    grid[GRID_VALUE] = name;
+    grid[GRID_LABEL_VALUE] = label;
+    grid[GRID_HELPER_URI_VALUE] = helper;
+    grid[GRID_LOGIN_URI_VALUE] = LLSD::emptyArray();
+    grid[GRID_LOGIN_URI_VALUE].append(login_uri);
+    grid[GRID_LOGIN_PAGE_VALUE] = login_page;
+    grid[GRID_UPDATE_SERVICE_URL] = update_url_base;
+    grid[GRID_WEB_PROFILE_VALUE] = web_profile_url;
+    grid[GRID_IS_SYSTEM_GRID_VALUE] = true;
+    grid[GRID_LOGIN_IDENTIFIER_TYPES] = LLSD::emptyArray();
+    grid[GRID_LOGIN_IDENTIFIER_TYPES].append(CRED_IDENTIFIER_TYPE_AGENT);
+
+    grid[GRID_APP_SLURL_BASE] = SYSTEM_GRID_APP_SLURL_BASE;
+    if (login_id.empty())
+    {
+        grid[GRID_ID_VALUE] = name;
+    }
+    else
+    {
+        grid[GRID_ID_VALUE] = login_id;
+    }
+
+    if (name == std::string(MAINGRID))
+    {
+        grid[GRID_SLURL_BASE] = MAIN_GRID_SLURL_BASE;
+    }
+    else
+    {
+        grid[GRID_SLURL_BASE] = llformat(SYSTEM_GRID_SLURL_BASE, grid[GRID_ID_VALUE].asString().c_str());
+    }
+
+    addGrid(grid);
 }
 
 // return a list of grid name -> grid label mappings for UI purposes
 std::map<std::string, std::string> LLGridManager::getKnownGrids()
 {
-	std::map<std::string, std::string> result;
-	for(LLSD::map_iterator grid_iter = mGridList.beginMap();
-		grid_iter != mGridList.endMap();
-		grid_iter++)
-	{
-		result[grid_iter->first] = grid_iter->second[GRID_LABEL_VALUE].asString();
-	}
-
-	return result;
+    std::map<std::string, std::string> result;
+    for(LLSD::map_iterator grid_iter = mGridList.beginMap();
+        grid_iter != mGridList.endMap();
+        grid_iter++)
+    {
+        result[grid_iter->first] = grid_iter->second[GRID_LABEL_VALUE].asString();
+    }
+
+    return result;
 }
 
 void LLGridManager::setGridChoice(const std::string& grid)
 {
-	// Set the grid choice based on a string.
-	LL_DEBUGS("GridManager")<<"requested "<<grid<<LL_ENDL;
- 	std::string grid_name = getGrid(grid); // resolved either the name or the id to the name
-
-	if(!grid_name.empty())
-	{
-		LL_INFOS("GridManager")<<"setting "<<grid_name<<LL_ENDL;
-		mGrid = grid_name;
-		gSavedSettings.setString("CurrentGrid", grid_name);
-		
-		updateIsInProductionGrid();
-	}
-	else
-	{
-		// the grid was not in the list of grids.
-		LL_WARNS("GridManager")<<"unknown grid "<<grid<<LL_ENDL;
-	}
+    // Set the grid choice based on a string.
+    LL_DEBUGS("GridManager")<<"requested "<<grid<<LL_ENDL;
+    std::string grid_name = getGrid(grid); // resolved either the name or the id to the name
+
+    if(!grid_name.empty())
+    {
+        LL_INFOS("GridManager")<<"setting "<<grid_name<<LL_ENDL;
+        mGrid = grid_name;
+        gSavedSettings.setString("CurrentGrid", grid_name);
+
+        updateIsInProductionGrid();
+    }
+    else
+    {
+        // the grid was not in the list of grids.
+        LL_WARNS("GridManager")<<"unknown grid "<<grid<<LL_ENDL;
+    }
 }
 
 std::string LLGridManager::getGrid( const std::string &grid )
 {
-	std::string grid_name;
-
-	if (mGridList.has(grid))
-	{
-		// the grid was the long name, so we're good, return it
-		grid_name = grid;
-	}
-	else
-	{
-		// search the grid list for a grid with a matching id
-		for(LLSD::map_iterator grid_iter = mGridList.beginMap();
-			grid_name.empty() && grid_iter != mGridList.endMap();
-			grid_iter++)
-		{
-			if (grid_iter->second.has(GRID_ID_VALUE))
-			{
-				if (0 == (LLStringUtil::compareInsensitive(grid,
-														   grid_iter->second[GRID_ID_VALUE].asString())))
-				{
-					// found a matching label, return this name
-					grid_name = grid_iter->first;
-				}
-			}
-		}
-	}
-	return grid_name;
+    std::string grid_name;
+
+    if (mGridList.has(grid))
+    {
+        // the grid was the long name, so we're good, return it
+        grid_name = grid;
+    }
+    else
+    {
+        // search the grid list for a grid with a matching id
+        for(LLSD::map_iterator grid_iter = mGridList.beginMap();
+            grid_name.empty() && grid_iter != mGridList.endMap();
+            grid_iter++)
+        {
+            if (grid_iter->second.has(GRID_ID_VALUE))
+            {
+                if (0 == (LLStringUtil::compareInsensitive(grid,
+                                                           grid_iter->second[GRID_ID_VALUE].asString())))
+                {
+                    // found a matching label, return this name
+                    grid_name = grid_iter->first;
+                }
+            }
+        }
+    }
+    return grid_name;
 }
 
 std::string LLGridManager::getGridLabel(const std::string& grid)
 {
-	std::string grid_label;
-	std::string grid_name = getGrid(grid);
-	if (!grid.empty())
-	{
-		grid_label = mGridList[grid_name][GRID_LABEL_VALUE].asString();
-	}
-	else
-	{
-		LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
-	}
-	LL_DEBUGS("GridManager")<<"returning "<<grid_label<<LL_ENDL;
-	return grid_label;
+    std::string grid_label;
+    std::string grid_name = getGrid(grid);
+    if (!grid.empty())
+    {
+        grid_label = mGridList[grid_name][GRID_LABEL_VALUE].asString();
+    }
+    else
+    {
+        LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
+    }
+    LL_DEBUGS("GridManager")<<"returning "<<grid_label<<LL_ENDL;
+    return grid_label;
 }
 
 std::string LLGridManager::getGridId(const std::string& grid)
 {
-	std::string grid_id;
-	std::string grid_name = getGrid(grid);
-	if (!grid.empty())
-	{
-		grid_id = mGridList[grid_name][GRID_ID_VALUE].asString();
-	}
-	else
-	{
-		LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
-	}
-	LL_DEBUGS("GridManager")<<"returning "<<grid_id<<LL_ENDL;
-	return grid_id;
+    std::string grid_id;
+    std::string grid_name = getGrid(grid);
+    if (!grid.empty())
+    {
+        grid_id = mGridList[grid_name][GRID_ID_VALUE].asString();
+    }
+    else
+    {
+        LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
+    }
+    LL_DEBUGS("GridManager")<<"returning "<<grid_id<<LL_ENDL;
+    return grid_id;
 }
 
 void LLGridManager::getLoginURIs(const std::string& grid, std::vector<std::string>& uris)
 {
-	uris.clear();
-	std::string grid_name = getGrid(grid);
-	if (!grid_name.empty())
-	{
+    uris.clear();
+    std::string grid_name = getGrid(grid);
+    if (!grid_name.empty())
+    {
         if (mGridList[grid_name][GRID_LOGIN_URI_VALUE].isArray())
         {
-		    for (LLSD::array_iterator llsd_uri = mGridList[grid_name][GRID_LOGIN_URI_VALUE].beginArray();
-			     llsd_uri != mGridList[grid_name][GRID_LOGIN_URI_VALUE].endArray();
-			     llsd_uri++)
-		    {
-			    uris.push_back(llsd_uri->asString());
-		    }
+            for (LLSD::array_iterator llsd_uri = mGridList[grid_name][GRID_LOGIN_URI_VALUE].beginArray();
+                 llsd_uri != mGridList[grid_name][GRID_LOGIN_URI_VALUE].endArray();
+                 llsd_uri++)
+            {
+                uris.push_back(llsd_uri->asString());
+            }
         }
         else
         {
             uris.push_back(mGridList[grid_name][GRID_LOGIN_URI_VALUE].asString());
         }
-	}
-	else
-	{
-		LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
-	}
+    }
+    else
+    {
+        LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
+    }
 }
 
 void LLGridManager::getLoginURIs(std::vector<std::string>& uris)
 {
-	getLoginURIs(mGrid, uris);
+    getLoginURIs(mGrid, uris);
 }
 
 std::string LLGridManager::getHelperURI(const std::string& grid)
 {
-	std::string helper_uri;
-	std::string grid_name = getGrid(grid);
-	if (!grid_name.empty())
-	{
-		helper_uri = mGridList[grid_name][GRID_HELPER_URI_VALUE].asString();
-	}
-	else
-	{
-		LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
-	}
-
-	LL_DEBUGS("GridManager")<<"returning "<<helper_uri<<LL_ENDL;
-	return helper_uri;
+    std::string helper_uri;
+    std::string grid_name = getGrid(grid);
+    if (!grid_name.empty())
+    {
+        helper_uri = mGridList[grid_name][GRID_HELPER_URI_VALUE].asString();
+    }
+    else
+    {
+        LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
+    }
+
+    LL_DEBUGS("GridManager")<<"returning "<<helper_uri<<LL_ENDL;
+    return helper_uri;
 }
 
 std::string LLGridManager::getLoginPage(const std::string& grid)
 {
-	std::string grid_login_page;
-	std::string grid_name = getGrid(grid);
-	if (!grid_name.empty())
-	{
-		grid_login_page = mGridList[grid_name][GRID_LOGIN_PAGE_VALUE].asString();
-	}
-	else
-	{
-		LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
-	}
-	return grid_login_page;
+    std::string grid_login_page;
+    std::string grid_name = getGrid(grid);
+    if (!grid_name.empty())
+    {
+        grid_login_page = mGridList[grid_name][GRID_LOGIN_PAGE_VALUE].asString();
+    }
+    else
+    {
+        LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
+    }
+    return grid_login_page;
 }
 
 std::string LLGridManager::getLoginPage()
 {
-	std::string login_page = mGridList[mGrid][GRID_LOGIN_PAGE_VALUE].asString();
-	LL_DEBUGS("GridManager")<<"returning "<<login_page<<LL_ENDL;
-	return login_page;
+    std::string login_page = mGridList[mGrid][GRID_LOGIN_PAGE_VALUE].asString();
+    LL_DEBUGS("GridManager")<<"returning "<<login_page<<LL_ENDL;
+    return login_page;
 }
 
 std::string LLGridManager::getWebProfileURL(const std::string& grid)
 {
-	std::string web_profile_url;
-	std::string grid_name = getGrid(grid);
-	if (!grid_name.empty())
-	{
-		web_profile_url = mGridList[grid_name][GRID_WEB_PROFILE_VALUE].asString();
-	}
-	else
-	{
-		LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
-	}
-	return web_profile_url;
+    std::string web_profile_url;
+    std::string grid_name = getGrid(grid);
+    if (!grid_name.empty())
+    {
+        web_profile_url = mGridList[grid_name][GRID_WEB_PROFILE_VALUE].asString();
+    }
+    else
+    {
+        LL_WARNS("GridManager")<<"invalid grid '"<<grid<<"'"<<LL_ENDL;
+    }
+    return web_profile_url;
 }
 
 void LLGridManager::getLoginIdentifierTypes(LLSD& idTypes)
 {
-	idTypes = mGridList[mGrid][GRID_LOGIN_IDENTIFIER_TYPES];
+    idTypes = mGridList[mGrid][GRID_LOGIN_IDENTIFIER_TYPES];
 }
 
 std::string LLGridManager::getGridLoginID()
 {
-	return mGridList[mGrid][GRID_ID_VALUE];
+    return mGridList[mGrid][GRID_ID_VALUE];
 }
 
 std::string LLGridManager::getUpdateServiceURL()
 {
-	std::string update_url_base = gSavedSettings.getString("CmdLineUpdateService");;
-	if ( !update_url_base.empty() )
-	{
-		LL_INFOS("UpdaterService","GridManager")
-			<< "Update URL base overridden from command line: " << update_url_base
-			<< LL_ENDL;
-	}
-	else if ( mGridList[mGrid].has(GRID_UPDATE_SERVICE_URL) )
-	{
-		update_url_base = mGridList[mGrid][GRID_UPDATE_SERVICE_URL].asString();
-	}
-	else
-	{
-		LL_WARNS("UpdaterService","GridManager")
-			<< "The grid property '" << GRID_UPDATE_SERVICE_URL
-			<< "' is not defined for the grid '" << mGrid << "'"
-			<< LL_ENDL;
-	}
-			
-	return update_url_base;
+    std::string update_url_base = gSavedSettings.getString("CmdLineUpdateService");;
+    if ( !update_url_base.empty() )
+    {
+        LL_INFOS("UpdaterService","GridManager")
+            << "Update URL base overridden from command line: " << update_url_base
+            << LL_ENDL;
+    }
+    else if ( mGridList[mGrid].has(GRID_UPDATE_SERVICE_URL) )
+    {
+        update_url_base = mGridList[mGrid][GRID_UPDATE_SERVICE_URL].asString();
+    }
+    else
+    {
+        LL_WARNS("UpdaterService","GridManager")
+            << "The grid property '" << GRID_UPDATE_SERVICE_URL
+            << "' is not defined for the grid '" << mGrid << "'"
+            << LL_ENDL;
+    }
+
+    return update_url_base;
 }
 
 void LLGridManager::updateIsInProductionGrid()
 {
-	mIsInProductionGrid = false;
-
-	// *NOTE:Mani This used to compare GRID_INFO_AGNI to gGridChoice,
-	// but it seems that loginURI trumps that.
-	std::vector<std::string> uris;
-	getLoginURIs(uris);
-	if (uris.empty())
-	{
-		mIsInProductionGrid = true;
-	}
-	else
-	{
-		for ( std::vector<std::string>::iterator uri_it = uris.begin();
-			  ! mIsInProductionGrid && uri_it != uris.end();
-			  uri_it++
-			 )
-		{
-			if( MAIN_GRID_LOGIN_URI == *uri_it )
-			{
-				mIsInProductionGrid = true;
-			}
-		}
-	}
+    mIsInProductionGrid = false;
+
+    // *NOTE:Mani This used to compare GRID_INFO_AGNI to gGridChoice,
+    // but it seems that loginURI trumps that.
+    std::vector<std::string> uris;
+    getLoginURIs(uris);
+    if (uris.empty())
+    {
+        mIsInProductionGrid = true;
+    }
+    else
+    {
+        for ( std::vector<std::string>::iterator uri_it = uris.begin();
+              ! mIsInProductionGrid && uri_it != uris.end();
+              uri_it++
+             )
+        {
+            if( MAIN_GRID_LOGIN_URI == *uri_it )
+            {
+                mIsInProductionGrid = true;
+            }
+        }
+    }
 }
 
 bool LLGridManager::isInProductionGrid()
 {
-	return mIsInProductionGrid;
+    return mIsInProductionGrid;
 }
 
 bool LLGridManager::isSystemGrid(const std::string& grid)
 {
-	std::string grid_name = getGrid(grid);
+    std::string grid_name = getGrid(grid);
 
-	return (   !grid_name.empty()
-			&& mGridList.has(grid)
-			&& mGridList[grid].has(GRID_IS_SYSTEM_GRID_VALUE)
-			&& mGridList[grid][GRID_IS_SYSTEM_GRID_VALUE].asBoolean()
-			);
+    return (   !grid_name.empty()
+            && mGridList.has(grid)
+            && mGridList[grid].has(GRID_IS_SYSTEM_GRID_VALUE)
+            && mGridList[grid][GRID_IS_SYSTEM_GRID_VALUE].asBoolean()
+            );
 }
 
 // build a slurl for the given region within the selected grid
 std::string LLGridManager::getSLURLBase(const std::string& grid)
 {
-	std::string grid_base = "";
-	std::string grid_name = getGrid(grid);
-	if( ! grid_name.empty() && mGridList.has(grid_name) )
-	{
-		if (mGridList[grid_name].has(GRID_SLURL_BASE))
-		{
-			grid_base = mGridList[grid_name][GRID_SLURL_BASE].asString();
-		}
-		else
-		{
-			grid_base = llformat(DEFAULT_SLURL_BASE, grid_name.c_str());
-		}
-	}
-	LL_DEBUGS("GridManager")<<"returning '"<<grid_base<<"'"<<LL_ENDL;
-	return grid_base;
+    std::string grid_base = "";
+    std::string grid_name = getGrid(grid);
+    if( ! grid_name.empty() && mGridList.has(grid_name) )
+    {
+        if (mGridList[grid_name].has(GRID_SLURL_BASE))
+        {
+            grid_base = mGridList[grid_name][GRID_SLURL_BASE].asString();
+        }
+        else
+        {
+            grid_base = llformat(DEFAULT_SLURL_BASE, grid_name.c_str());
+        }
+    }
+    LL_DEBUGS("GridManager")<<"returning '"<<grid_base<<"'"<<LL_ENDL;
+    return grid_base;
 }
 
 // build a slurl for the given region within the selected grid
 std::string LLGridManager::getAppSLURLBase(const std::string& grid)
 {
-	std::string grid_base = "";
-	std::string grid_name = getGrid(grid);
-	if(!grid_name.empty() && mGridList.has(grid))
-	{
-		if (mGridList[grid].has(GRID_APP_SLURL_BASE))
-		{
-			grid_base = mGridList[grid][GRID_APP_SLURL_BASE].asString();
-		}
-		else
-		{
-			grid_base = llformat(DEFAULT_APP_SLURL_BASE, grid_name.c_str());
-		}
-	}
-	LL_DEBUGS("GridManager")<<"returning '"<<grid_base<<"'"<<LL_ENDL;
-	return grid_base;
+    std::string grid_base = "";
+    std::string grid_name = getGrid(grid);
+    if(!grid_name.empty() && mGridList.has(grid))
+    {
+        if (mGridList[grid].has(GRID_APP_SLURL_BASE))
+        {
+            grid_base = mGridList[grid][GRID_APP_SLURL_BASE].asString();
+        }
+        else
+        {
+            grid_base = llformat(DEFAULT_APP_SLURL_BASE, grid_name.c_str());
+        }
+    }
+    LL_DEBUGS("GridManager")<<"returning '"<<grid_base<<"'"<<LL_ENDL;
+    return grid_base;
 }
-- 
cgit v1.2.3