1 files changed, 34 insertions, 38 deletions

diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 3652ebb..bca7415 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -13,12 +13,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -45,54 +45,30 @@ LLGridData gGridInfo[GRID_INFO_COUNT] =
           "util.agni.lindenlab.com", 
           "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
           "https://secondlife.com/helpers/" },
-        { "DMZ",  
-          "util.dmz.lindenlab.com", 
-          "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
-          "http://dmz-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Siva", 
-          "util.siva.lindenlab.com",
-          "https://login.siva.lindenlab.com/cgi-bin/login.cgi",
-          "http://siva-secondlife.webdev.lindenlab.com/helpers/" },
+        { "Aruna",
+          "util.aruna.lindenlab.com",
+          "https://login.aruna.lindenlab.com/cgi-bin/login.cgi",
+          "http://aruna-secondlife.webdev.lindenlab.com/helpers/" },
         { "Durga",
           "util.durga.lindenlab.com",
           "https://login.durga.lindenlab.com/cgi-bin/login.cgi",
           "http://durga-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Shakti",
-          "util.shakti.lindenlab.com",
-          "https://login.shakti.lindenlab.com/cgi-bin/login.cgi",
-          "http://shakti-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Soma",
-          "util.soma.lindenlab.com",
-          "https://login.soma.lindenlab.com/cgi-bin/login.cgi",
-          "http://soma-secondlife.webdev.lindenlab.com/helpers/" },
         { "Ganga",
           "util.ganga.lindenlab.com",
           "https://login.ganga.lindenlab.com/cgi-bin/login.cgi",
           "http://ganga-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Vaak",
-          "util.vaak.lindenlab.com",
-          "https://login.vaak.lindenlab.com/cgi-bin/login.cgi",
-          "http://vaak-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Uma",
-          "util.uma.lindenlab.com",
-          "https://login.uma.lindenlab.com/cgi-bin/login.cgi",
-          "http://uma-secondlife.webdev.lindenlab.com/helpers/" },
+        { "Mitra",
+          "util.mitra.lindenlab.com",
+          "https://login.mitra.lindenlab.com/cgi-bin/login.cgi",
+          "http://mitra-secondlife.webdev.lindenlab.com/helpers/" },
         { "Mohini",
           "util.mohini.lindenlab.com",
           "https://login.mohini.lindenlab.com/cgi-bin/login.cgi",
           "http://mohini-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Yami",
-          "util.yami.lindenlab.com",
-          "https://login.yami.lindenlab.com/cgi-bin/login.cgi",
-          "http://yami-secondlife.webdev.lindenlab.com/helpers/" },
         { "Nandi",
           "util.nandi.lindenlab.com",
           "https://login.nandi.lindenlab.com/cgi-bin/login.cgi",
           "http://nandi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Mitra",
-          "util.mitra.lindenlab.com",
-          "https://login.mitra.lindenlab.com/cgi-bin/login.cgi",
-          "http://mitra-secondlife.webdev.lindenlab.com/helpers/" },
         { "Radha",
           "util.radha.lindenlab.com",
           "https://login.radha.lindenlab.com/cgi-bin/login.cgi",
@@ -101,10 +77,30 @@ LLGridData gGridInfo[GRID_INFO_COUNT] =
           "util.ravi.lindenlab.com",
           "https://login.ravi.lindenlab.com/cgi-bin/login.cgi",
           "http://ravi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Aruna",
-          "util.aruna.lindenlab.com",
-          "https://login.aruna.lindenlab.com/cgi-bin/login.cgi",
-          "http://aruna-secondlife.webdev.lindenlab.com/helpers/" },
+        { "Siva", 
+          "util.siva.lindenlab.com",
+          "https://login.siva.lindenlab.com/cgi-bin/login.cgi",
+          "http://siva-secondlife.webdev.lindenlab.com/helpers/" },
+        { "Shakti",
+          "util.shakti.lindenlab.com",
+          "https://login.shakti.lindenlab.com/cgi-bin/login.cgi",
+          "http://shakti-secondlife.webdev.lindenlab.com/helpers/" },
+        { "Soma",
+          "util.soma.lindenlab.com",
+          "https://login.soma.lindenlab.com/cgi-bin/login.cgi",
+          "http://soma-secondlife.webdev.lindenlab.com/helpers/" },
+        { "Uma",
+          "util.uma.lindenlab.com",
+          "https://login.uma.lindenlab.com/cgi-bin/login.cgi",
+          "http://uma-secondlife.webdev.lindenlab.com/helpers/" },
+        { "Vaak",
+          "util.vaak.lindenlab.com",
+          "https://login.vaak.lindenlab.com/cgi-bin/login.cgi",
+          "http://vaak-secondlife.webdev.lindenlab.com/helpers/" },
+        { "Yami",
+          "util.yami.lindenlab.com",
+          "https://login.yami.lindenlab.com/cgi-bin/login.cgi",
+          "http://yami-secondlife.webdev.lindenlab.com/helpers/" },
         { "Local", 
           "localhost", 
           "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",