1 files changed, 16 insertions, 5 deletions

diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 7d1d351..7fb19af 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -38,6 +38,7 @@
 struct LLGridData
 {
         const char* mLabel;
+  const char* mCodeName;
         const char* mName;
         const char* mLoginURI;
         const char* mHelperURI;
@@ -45,23 +46,23 @@ struct LLGridData
 
 static LLGridData gGridInfo[GRID_INFO_COUNT] = 
 {
-        { "None", "", "", ""},
+        { "None", "", "", "", "" },
         { "SL Beta Grid",
+          "Aditi",
           "util.aditi.lindenlab.com",
           "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
           "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
         { "SL Main Grid",
+          "Agni",
           "util.agni.lindenlab.com", 
           "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
           "https://secondlife.com/helpers/" },
         { "Local OpenSim",
+          "",
           "localhost",
           "http://0.0.0.0:9000",
           "" },
-        { "Other",
-          "",
-          "",
-          "" }
+        { "Other", "", "", "", "" }
 };
 
 const EGridInfo DEFAULT_GRID_CHOICE = GRID_INFO_AGNI;
@@ -160,6 +161,16 @@ std::string LLViewerLogin::getGridLabel() const
         return mGridName;
 }
 
+std::string LLViewerLogin::getGridCodeName() const
+{
+        if( gGridInfo[mGridChoice].mCodeName == "" )
+        {
+                return getGridLabel();
+        }
+
+        return gGridInfo[mGridChoice].mCodeName;
+}
+
 std::string LLViewerLogin::getKnownGridLabel(EGridInfo grid_index) const
 {
         if(grid_index > GRID_INFO_NONE && grid_index < GRID_INFO_OTHER)