From 1e8fc6b3f0ef48f406ac19de93d57d8ab9fc10cd Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 29 Jun 2011 10:30:38 +1000
Subject: Clean out no longer needed commented code.

---
 linden/indra/newview/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index cdc2a9a..fa306a5 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1251,19 +1251,15 @@ set(viewer_APPSETTINGS_FILES
     app_settings/cmd_line.xml
     app_settings/default_grids.xml
     app_settings/grass.xml
-#    app_settings/high_graphics.xml
     app_settings/keys.ini
     app_settings/keywords.ini
     app_settings/logcontrol.xml
-#    app_settings/low_graphics.xml
-#    app_settings/mid_graphics.xml
     app_settings/settings.xml
     app_settings/settings_crash_behavior.xml
     app_settings/settings_files.xml
     app_settings/settings_per_account.xml
     app_settings/std_bump.ini
     app_settings/trees.xml
-#    app_settings/ultra_graphics.xml
     app_settings/viewerart.xml
     ${CMAKE_SOURCE_DIR}/../etc/message.xml
     ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
-- 
cgit v1.1


From 742aa2e49b42b02fed00ef3f7dc35fa2e9cf1ce8 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 29 Jun 2011 10:30:57 +1000
Subject: Add the iGrid developmnet grid.

---
 linden/indra/newview/app_settings/default_grids.xml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index bdb0029..8eaa0b2 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -34,14 +34,29 @@
       <key>loginuri</key>  <string>http://grid.infinitegrid.org:8002/</string>
       <key>loginpage</key> <string>http://webfront.infinitegrid.org/loginscreen.php</string>
       <key>helperuri</key> <string>http://www.infinitegrid.org/helper/</string>
-      <key>password</key>  <string>http://webfront.infinitegrid.org//</string>
-      <key>register</key>  <string>http://webfront.infinitegrid.org//</string>
+      <key>password</key>  <string>http://webfront.infinitegrid.org/</string>
+      <key>register</key>  <string>http://webfront.infinitegrid.org/</string>
       <key>support</key>   <string>http://www.infinitegrid.org/help</string>
       <key>website</key>   <string>http://www.infinitegrid.org/about/</string>
       <key>search</key>    <string>http://webi.metaverseink.com/</string>
       <key>version</key>   <string>0</string>
     </map>
 
+    <!-- Infinite Grid dev-->
+    <map>
+      <key>gridname</key>  <string>Infinite Grid dev</string>
+      <key>gridnick</key>  <string>infinitegriddev</string>
+      <key>platform</key>  <string>OpenSim</string>
+      <key>loginuri</key>  <string>http://grid.infinitegrid.org:8502/</string>
+      <key>loginpage</key> <string>http://www.infinitegrid.org/webdev/loginscreen.php</string>
+      <key>helperuri</key> <string>http://www.infinitegrid.org/webdev/helper/</string>
+      <key>password</key>  <string>http://www.infinitegrid.org/webdev/</string>
+      <key>register</key>  <string>http://www.infinitegrid.org/webdev/</string>
+      <key>support</key>   <string>http://www.infinitegrid.org/webdev/help</string>
+      <key>website</key>   <string>http://www.infinitegrid.org/webdev/about/</string>
+      <key>version</key>   <string>0</string>
+    </map>
+
     <!-- InWorldz -->
     <map>
       <key>gridname</key>  <string>InWorldz</string>
-- 
cgit v1.1