From 037d0e34027db6fb4c94c6bba7d70cd56b1b4077 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 1 Nov 2010 20:20:52 -0700
Subject: Load default grid list url from new GridUpdateList setting

---
 linden/indra/newview/app_settings/settings.xml | 11 +++++++++++
 linden/indra/newview/hippoGridManager.cpp      |  4 ++--
 linden/indra/newview/hippoGridManager.h        |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e668782..916abcb 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -506,6 +506,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>GridUpdateList</key>
+  <map>
+    <key>Comment</key>
+    <string>Location to download default grid options.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>http://imprudenceviewer.org/app/grids/</string>
+  </map>
   <key>GoAction</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/hippoGridManager.cpp b/linden/indra/newview/hippoGridManager.cpp
index 5a229fd..dd0fa35 100644
--- a/linden/indra/newview/hippoGridManager.cpp
+++ b/linden/indra/newview/hippoGridManager.cpp
@@ -799,7 +799,7 @@ 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("http://imprudenceviewer.org/app/grids/", !mGridInfo.empty());
+		parseUrl(gSavedSettings.getString("GridUpdateList"), !mGridInfo.empty());
 
 	std::string last_grid = gSavedSettings.getString("LastSelectedGrid");
 	if (last_grid.empty()) last_grid = gSavedSettings.getString("DefaultGrid");
@@ -808,7 +808,7 @@ void HippoGridManager::loadFromFile()
 }
 
 
-void HippoGridManager::parseUrl(const char* url, bool mergeIfNewer)
+void HippoGridManager::parseUrl(const std::string url, bool mergeIfNewer)
 {
 	llinfos << "Loading grid info from '" << url << "'." << llendl;
 
diff --git a/linden/indra/newview/hippoGridManager.h b/linden/indra/newview/hippoGridManager.h
index bc19ff8..8429dba 100644
--- a/linden/indra/newview/hippoGridManager.h
+++ b/linden/indra/newview/hippoGridManager.h
@@ -172,7 +172,7 @@ private:
 	void cleanup();
 	void loadFromFile();
 	void parseFile(const std::string& fileName, bool mergeIfNewer);
-	void parseUrl(const char* url, bool mergeIfNewer);
+	void parseUrl(const std::string url, bool mergeIfNewer);
 	void parseData(LLSD &gridInfo, bool mergeIfNewer);
 };
 
-- 
cgit v1.1