Merge 1.0.0 RC2 into openal

7 files changed, 47 insertions, 167 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index f442f38..4fe387f 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1605,11 +1605,6 @@ bool LLAppViewer::initConfiguration()
 
         gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);
 
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-        gSavedSettings.setBOOL("ShowConsoleWindow", TRUE);
-        gSavedSettings.setBOOL("AllowMultipleViewers", TRUE);
-#endif
-
 #if !LL_DYNAMIC_FONT_DISCOVERY
         // static font discovery - user settings can override.
         gSavedSettings.setString("FontSansSerifFallback",
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 0f89585..5e4aafc 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -951,6 +951,9 @@ BOOL LLDrawable::isVisible() const
                 return TRUE;
         }
         
+#if 0
+        //disabling this code fixes DEV-20105.  Leaving in place in case some other bug pops up as a a result.
+        //should be safe to just always ask the spatial group for visibility.
         if (isActive())
         {
                 if (isRoot())
@@ -973,6 +976,7 @@ BOOL LLDrawable::isVisible() const
                 }
         }
         else
+#endif
         {
                 LLSpatialGroup* group = getSpatialGroup();
                 if (group && group->isVisible())
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 305a029..9a0c2fc 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -383,10 +383,6 @@ void LLFloaterDirectory::showPanel(const std::string& tabname)
 // static
 void LLFloaterDirectory::toggleFind(void*)
 {
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-        delete sInstance;
-        sInstance = NULL;
-#endif
         if (!sInstance)
         {
                 std::string panel = gSavedSettings.getString("LastFindPanel");
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 61bf215..09e2cee 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -134,74 +134,14 @@ void LLLoginHandler::parse(const LLSD& queryMap)
         mLastName = queryMap["last_name"].asString();
         
         EGridInfo grid_choice = GRID_INFO_NONE;
-        if (queryMap["grid"].asString() == "aditi")
+        if (queryMap["grid"].asString() == "sl beta grid")
         {
                 grid_choice = GRID_INFO_ADITI;
         }
-        else if (queryMap["grid"].asString() == "agni")
+        else if (queryMap["grid"].asString() == "sl main grid")
         {
                 grid_choice = GRID_INFO_AGNI;
         }
-        else if (queryMap["grid"].asString() == "siva")
-        {
-                grid_choice = GRID_INFO_SIVA;
-        }
-        else if (queryMap["grid"].asString() == "damballah")
-        {
-                grid_choice = GRID_INFO_DAMBALLAH;
-        }
-        else if (queryMap["grid"].asString() == "durga")
-        {
-                grid_choice = GRID_INFO_DURGA;
-        }
-        else if (queryMap["grid"].asString() == "shakti")
-        {
-                grid_choice = GRID_INFO_SHAKTI;
-        }
-        else if (queryMap["grid"].asString() == "soma")
-        {
-                grid_choice = GRID_INFO_SOMA;
-        }
-        else if (queryMap["grid"].asString() == "ganga")
-        {
-                grid_choice = GRID_INFO_GANGA;
-        }
-        else if (queryMap["grid"].asString() == "vaak")
-        {
-                grid_choice = GRID_INFO_VAAK;
-        }
-        else if (queryMap["grid"].asString() == "uma")
-        {
-                grid_choice = GRID_INFO_UMA;
-        }
-        else if (queryMap["grid"].asString() == "mohini")
-        {
-                grid_choice = GRID_INFO_MOHINI;
-        }
-        else if (queryMap["grid"].asString() == "yami")
-        {
-                grid_choice = GRID_INFO_YAMI;
-        }
-        else if (queryMap["grid"].asString() == "nandi")
-        {
-                grid_choice = GRID_INFO_NANDI;
-        }
-        else if (queryMap["grid"].asString() == "mitra")
-        {
-                grid_choice = GRID_INFO_MITRA;
-        }
-        else if (queryMap["grid"].asString() == "radha")
-        {
-                grid_choice = GRID_INFO_RADHA;
-        }
-        else if (queryMap["grid"].asString() == "ravi")
-        {
-                grid_choice = GRID_INFO_RAVI;
-        }
-        else if (queryMap["grid"].asString() == "aruna")
-        {
-                grid_choice = GRID_INFO_ARUNA;
-        }
 
         if(grid_choice != GRID_INFO_NONE)
         {
@@ -849,12 +789,7 @@ void LLPanelLogin::refreshLocation( bool force_visible )
         sInstance->childSetVisible("start_location_combo", show_start);
         sInstance->childSetVisible("start_location_text", show_start);
 
-#if LL_RELEASE_FOR_DOWNLOAD
-        BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
-        sInstance->childSetVisible("server_combo", show_server);
-#else
         sInstance->childSetVisible("server_combo", TRUE);
-#endif
 
 #endif
 }
@@ -937,7 +872,7 @@ void LLPanelLogin::loadLoginPage()
         curl_free(curl_version);
 
         // Grid
-        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridLabel().c_str(), 0);
+        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridCodeName().c_str(), 0);
         oStr << "&grid=" << curl_grid;
         curl_free(curl_grid);
 
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 11e4ac5..4266d82 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2496,7 +2496,7 @@ void login_show()
         LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice());
 
         LLViewerLogin* vl = LLViewerLogin::getInstance();
-        for(int grid_index = GRID_INFO_ADITI; grid_index < GRID_INFO_OTHER; ++grid_index)
+        for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index)
         {
                 LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index);
         }
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 13d432a..c8cffcf 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,83 +46,23 @@ struct LLGridData
 
 static LLGridData gGridInfo[GRID_INFO_COUNT] = 
 {
-        { "None", "", "", ""},
-        { "Aditi", 
-          "util.aditi.lindenlab.com", 
-          "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
-          "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Agni", 
+        { "None", "", "", "", "" },
+        { "SL Main Grid",
+          "Agni",
           "util.agni.lindenlab.com", 
           "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
           "https://secondlife.com/helpers/" },
-        { "Aruna",
-          "util.aruna.lindenlab.com",
-          "https://login.aruna.lindenlab.com/cgi-bin/login.cgi",
-          "http://aruna-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Damballah",
-          "util.damballah.lindenlab.com",
-          "https://login.damballah.lindenlab.com/cgi-bin/login.cgi",
-          "http://damballah-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/" },
-        { "Ganga",
-          "util.ganga.lindenlab.com",
-          "https://login.ganga.lindenlab.com/cgi-bin/login.cgi",
-          "http://ganga-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/" },
-        { "Nandi",
-          "util.nandi.lindenlab.com",
-          "https://login.nandi.lindenlab.com/cgi-bin/login.cgi",
-          "http://nandi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Radha",
-          "util.radha.lindenlab.com",
-          "https://login.radha.lindenlab.com/cgi-bin/login.cgi",
-          "http://radha-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Ravi",
-          "util.ravi.lindenlab.com",
-          "https://login.ravi.lindenlab.com/cgi-bin/login.cgi",
-          "http://ravi-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",
+        { "SL Beta Grid",
+          "Aditi",
+          "util.aditi.lindenlab.com",
+          "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
+          "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
+        { "Local OpenSim",
+          "",
+          "localhost",
+          "http://127.0.0.1:9000",
           "" },
-        { "Other", 
-          "", 
-          "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
-          "" }
+        { "Other", "", "", "", "" }
 };
 
 const EGridInfo DEFAULT_GRID_CHOICE = GRID_INFO_AGNI;
@@ -220,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)
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 53bb0ab..970e2ce 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -38,23 +38,8 @@ class LLHost;
 enum EGridInfo
 {
         GRID_INFO_NONE,
-        GRID_INFO_ADITI,
         GRID_INFO_AGNI,
-        GRID_INFO_ARUNA,
-        GRID_INFO_DAMBALLAH,
-        GRID_INFO_DURGA,
-        GRID_INFO_GANGA,
-        GRID_INFO_MITRA,
-        GRID_INFO_MOHINI,
-        GRID_INFO_NANDI,
-        GRID_INFO_RADHA,
-        GRID_INFO_RAVI,
-        GRID_INFO_SIVA,
-        GRID_INFO_SHAKTI,
-        GRID_INFO_SOMA,
-        GRID_INFO_UMA,
-        GRID_INFO_VAAK,
-        GRID_INFO_YAMI,
+        GRID_INFO_ADITI,
         GRID_INFO_LOCAL,
         GRID_INFO_OTHER, // IP address set via command line option
         GRID_INFO_COUNT
@@ -87,6 +72,20 @@ public:
         **/
         std::string getGridLabel() const; 
 
+  /**
+   * @brief Get the code name for the grid choice.
+   *
+   * Returns the code name for the grid choice, as designated
+   * by Linden Lab. The SL main grid is Agni, and the beta
+   * grid is Aditi. There are other LL testing grids with code
+   * names, but we don't care about those.
+   *
+   * This string is used primarily for fetching the proper
+   * login splash page, since the web server expects "Agni"
+   * and "Aditi", not "SL Main Grid" and "SL Beta Grid".
+   */
+        std::string getGridCodeName() const; 
+
         std::string getKnownGridLabel(EGridInfo grid_index) const; 
 
         void getLoginURIs(std::vector<std::string>& uris) const;