1 files changed, 41 insertions, 47 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index d9dbaaa..c357b8f 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -12,12 +12,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,
@@ -198,8 +198,8 @@ static EGridInfo GridDefaultChoice = GRID_INFO_AGNI;
 static EGridInfo GridDefaultChoice = GRID_INFO_ADITI;
 #endif
 #else
-// Default userserver for development builds is dmz
-static EGridInfo GridDefaultChoice = GRID_INFO_DMZ;
+// Default userserver for development builds is none
+static EGridInfo GridDefaultChoice = GRID_INFO_NONE;
 #endif
 
 #if LL_WINDOWS
@@ -430,7 +430,7 @@ static void ui_audio_callback(const LLUUID& uuid)
 {
         if (gAudiop)
         {
-                F32 volume = gSavedSettings.getF32("AudioLevelUI");
+                F32 volume = gSavedSettings.getBOOL("MuteUI") ? 0.f : gSavedSettings.getF32("AudioLevelUI");
                 gAudiop->triggerSound(uuid, gAgent.getID(), volume);
         }
 }
@@ -588,44 +588,24 @@ int parse_args(int argc, char **argv)
                         gGridChoice = GRID_INFO_AGNI;
                         snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
                 }
-                else if (!strcmp(argv[j], "--dmz"))
-                {
-                        gGridChoice = GRID_INFO_DMZ;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--siva"))
-                {
-                        gGridChoice = GRID_INFO_SIVA;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--shakti"))
+                else if (!strcmp(argv[j], "--aruna"))
                 {
-                        gGridChoice = GRID_INFO_SHAKTI;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
+                        gGridChoice = GRID_INFO_ARUNA;
+                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
                 }
                 else if (!strcmp(argv[j], "--durga"))
                 {
                         gGridChoice = GRID_INFO_DURGA;
                         snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
                 }
-                else if (!strcmp(argv[j], "--soma"))
-                {
-                        gGridChoice = GRID_INFO_SOMA;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
                 else if (!strcmp(argv[j], "--ganga"))
                 {
                         gGridChoice = GRID_INFO_GANGA;
                         sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
                 }
-                else if (!strcmp(argv[j], "--vaak"))
-                {
-                        gGridChoice = GRID_INFO_VAAK;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--uma"))
+                else if (!strcmp(argv[j], "--mitra"))
                 {
-                        gGridChoice = GRID_INFO_UMA;
+                        gGridChoice = GRID_INFO_MITRA;
                         sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
                 }
                 else if (!strcmp(argv[j], "--mohini"))
@@ -633,21 +613,11 @@ int parse_args(int argc, char **argv)
                         gGridChoice = GRID_INFO_MOHINI;
                         sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
                 }
-                else if (!strcmp(argv[j], "--yami"))
-                {
-                        gGridChoice = GRID_INFO_YAMI;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
                 else if (!strcmp(argv[j], "--nandi"))
                 {
                         gGridChoice = GRID_INFO_NANDI;
                         sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
                 }
-                else if (!strcmp(argv[j], "--mitra"))
-                {
-                        gGridChoice = GRID_INFO_MITRA;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
                 else if (!strcmp(argv[j], "--radha"))
                 {
                         gGridChoice = GRID_INFO_RADHA;
@@ -658,9 +628,34 @@ int parse_args(int argc, char **argv)
                         gGridChoice = GRID_INFO_RAVI;
                         sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
                 }
-                else if (!strcmp(argv[j], "--aruna"))
+                else if (!strcmp(argv[j], "--siva"))
                 {
-                        gGridChoice = GRID_INFO_ARUNA;
+                        gGridChoice = GRID_INFO_SIVA;
+                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
+                }
+                else if (!strcmp(argv[j], "--shakti"))
+                {
+                        gGridChoice = GRID_INFO_SHAKTI;
+                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
+                }
+                else if (!strcmp(argv[j], "--soma"))
+                {
+                        gGridChoice = GRID_INFO_SOMA;
+                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
+                }
+                else if (!strcmp(argv[j], "--uma"))
+                {
+                        gGridChoice = GRID_INFO_UMA;
+                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
+                }
+                else if (!strcmp(argv[j], "--vaak"))
+                {
+                        gGridChoice = GRID_INFO_VAAK;
+                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
+                }
+                else if (!strcmp(argv[j], "--yami"))
+                {
+                        gGridChoice = GRID_INFO_YAMI;
                         sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
                 }
                 else if (!strcmp(argv[j], "-user") && (++j < argc)) 
@@ -1574,6 +1569,9 @@ bool LLAppViewer::cleanup()
         delete gGlobalEconomy;
         gGlobalEconomy = NULL;
 
+        delete gActiveChannelSpeakerMgr;
+        gActiveChannelSpeakerMgr = NULL;
+
         delete gLocalSpeakerMgr;
         gLocalSpeakerMgr = NULL;
 
@@ -1873,10 +1871,6 @@ bool LLAppViewer::initEarlyConfiguration()
                 {
                         snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_AGNI].mName);         // Flawfinder: ignore
                 }
-                else if (!strcmp(argv[j], "--dmz"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_DMZ].mName);          // Flawfinder: ignore
-                }
                 else if (!strcmp(argv[j], "--siva"))
                 {
                         snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_SIVA].mName);         // Flawfinder: ignore
@@ -3081,7 +3075,7 @@ const std::vector<std::string>& LLAppViewer::getLoginURIs() const
         if (gLoginURIs.empty())
         {
                 // not specified on the command line, use value from table
-                gLoginURIs = LLSRV::rewriteURI(gGridInfo[gGridChoice].mLoginURI);
+                gLoginURIs.push_back(gGridInfo[gGridChoice].mLoginURI);
         }
         return gLoginURIs;
 }