From 5f00d4c76e952fa865dc7cbc63fd17bf6a3c0c7b Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 22 Mar 2011 11:39:09 +0100
Subject: Don't try to fetch grid list from empty url in GridUpdateList

---
 linden/indra/newview/hippogridmanager.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/hippogridmanager.cpp b/linden/indra/newview/hippogridmanager.cpp
index d56214c..74c9997 100644
--- a/linden/indra/newview/hippogridmanager.cpp
+++ b/linden/indra/newview/hippogridmanager.cpp
@@ -799,7 +799,17 @@ void HippoGridManager::loadFromFile()
 	parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty());
 	// merge grid info from web site, if newer. Force load, if list of grids is empty.
 	if (gSavedSettings.getBOOL("CheckForGridUpdates"))
-		parseUrl(gSavedSettings.getString("GridUpdateList"), !mGridInfo.empty());
+	{
+		std::string update_list = gSavedSettings.getString("GridUpdateList");
+		if (!update_list.empty())
+		{
+			parseUrl(update_list, !mGridInfo.empty());
+		}
+		else
+		{
+			llwarns << "\"CheckForGridUpdates\" is set to true, but \"GridUpdateList\" contains no URL to fetch the grid info from. Skipping." << llendl;
+		}
+	}
 
 	std::string last_grid = gSavedSettings.getString("LastSelectedGrid");
 	if (last_grid.empty()) last_grid = gSavedSettings.getString("DefaultGrid");
-- 
cgit v1.1