From ec966323dc20c0108bea0c7eb0bb402c4ff9fba2 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 29 Nov 2016 19:59:44 +0100
Subject: [PATCH 1/5] Add Beq Janus as team member

---
 indra/newview/skins/default/xui/en/floater_about.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index bad60ea3e6..74b1695f77 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -140,7 +140,7 @@ The Firestorm Development Team:
                  top_pad="4"
                  width="420"
                  wrap="true">
-Ansariel Hiller, ArminWeatherHax, Arrehn Oberlander, Cinder Roxley, Holy Gavenkrantz, Jessica Lyon, Kadah Coba, Kitty Barnett, Liny Odell, LordGregGreg Back, Mobius Ryba, Nicky Dasmijn, PanteraPolnocy, Selo Jacobus, Tankmaster Finesmith, Techwolf Lupindo, Tonya Souther, Tozh Taurog, Vortex Saito, WoLf Loonie, Wolfspirit Magic and Zi Ree.
+Ansariel Hiller, ArminWeatherHax, Arrehn Oberlander, Beq Janus, Cinder Roxley, Holy Gavenkrantz, Jessica Lyon, Kadah Coba, Kitty Barnett, Liny Odell, LordGregGreg Back, Mobius Ryba, Nicky Dasmijn, PanteraPolnocy, Selo Jacobus, Tankmaster Finesmith, Techwolf Lupindo, Tonya Souther, Tozh Taurog, Vortex Saito, WoLf Loonie, Wolfspirit Magic and Zi Ree.
                 </text>
                 <text
                  follows="top|left"

From 37aee9e812a9c66953657a2884f3f2310c2c078e Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Wed, 30 Nov 2016 10:26:12 +0100
Subject: [PATCH 2/5] Updated Polish translation

---
 indra/newview/skins/default/xui/pl/floater_tools.xml |  4 ++--
 indra/newview/skins/default/xui/pl/menu_viewer.xml   | 10 +++++-----
 indra/newview/skins/default/xui/pl/strings.xml       |  3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 989f654825..5b6ce33bbf 100644
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -77,8 +77,8 @@
 		<radio_item label="Wyrównywanie" name="radio align"/>
 	</radio_group>
 	<check_box label="Edytuj połączone części" name="checkbox edit linked parts"/>
-	<button name="prev_part_btn" tool_tip="Wybierz poprzednią połączoną część"/>
-	<button name="next_part_btn" tool_tip="Wybierz następną połączoną część"/>
+	<button name="prev_part_btn" tool_tip="Wybierz poprzednią połączoną część lub stronę"/>
+	<button name="next_part_btn" tool_tip="Wybierz następną połączoną część lub stronę"/>
 	<button label="Scalaj" name="link_btn"/>
 	<button label="Rozłącz" name="unlink_btn"/>
 	<combo_box name="combobox grid mode" tool_tip="Wybierz rodzaj linijki siatki dla pozycjonowania obiektu">
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 1bedb2f5c8..5d1cb4f0ea 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -145,11 +145,11 @@
 		<menu_item_call label="Scal" name="Link"/>
 		<menu_item_call label="Rozłącz" name="Unlink"/>
 		<menu_item_check label="Edytuj połączone części" name="Edit Linked Parts"/>
-		<menu label="Wybierz połączone części" name="Select Linked Parts">
-			<menu_item_call label="Wybierz następną część" name="Select Next Part"/>
-			<menu_item_call label="Zaznacz poprzednią część" name="Select Previous Part"/>
-			<menu_item_call label="Uwzględnij następną część" name="Include Next Part"/>
-			<menu_item_call label="Uwzględnij poprzednią część" name="Include Previous Part"/>
+		<menu label="Wybierz elementy" name="Select Elements">
+			<menu_item_call label="Wybierz następną część lub stronę" name="Select Next Part or Face"/>
+			<menu_item_call label="Zaznacz poprzednią część lub stronę" name="Select Previous Part or Face"/>
+			<menu_item_call label="Uwzględnij następną część lub stronę" name="Include Next Part or Face"/>
+			<menu_item_call label="Uwzględnij poprzednią część lub stronę" name="Include Previous Part or Face"/>
 		</menu>
 		<menu_item_call label="Wycentruj na selekcji" name="Focus on Selection"/>
 		<menu_item_call label="Przybliż do selekcji" name="Zoom to Selection"/>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 8a329af41e..0482c448ab 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -676,6 +676,9 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="TooltipSLAPP">
 		Kliknij aby uruchomić komendę secondlife://
 	</string>
+	<string name="TooltipFSHelpDebugSLUrl">
+		Kliknij aby otworzyć ustawienia debugowania dla tej opcji
+	</string>
 	<string name="CurrentURL" value=" Obecny URL: [CurrentURL]"/>
 	<string name="TooltipEmail">
 		Kliknij aby utworzyć wiadomość e-mail

From 05c6c72b15fb0cf76a0123857cedf2a67b6452b7 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 30 Nov 2016 15:41:15 +0100
Subject: [PATCH 3/5] Add build switch to generate time-limited test builds.
 Use via --testbuild <days>

---
 indra/CMakeLists.txt                          |  8 +++
 indra/newview/llstartup.cpp                   | 56 ++++++++++++++++++-
 .../skins/default/xui/de/notifications.xml    |  6 ++
 .../skins/default/xui/en/notifications.xml    | 10 ++++
 scripts/configure_firestorm.sh                | 19 +++++--
 5 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index a06eed0647..afd1b664a2 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -35,6 +35,14 @@ else (OPENSIM)
 endif (OPENSIM)
 #</FS:AW optional opensim support>
 
+#<FS:Ansariel> Support for test builds
+option(TESTBUILD "Generating test build" OFF)
+if(TESTBUILD AND TESTBUILDPERIOD)
+  add_definitions(-DTESTBUILD=1 -DTESTBUILDPERIOD=${TESTBUILDPERIOD})
+  message("creating test build version; test period: ${TESTBUILDPERIOD} days")
+endif(TESTBUILD AND TESTBUILDPERIOD)
+#</FS:Ansariel>
+
 # <FS:Ansariel> [AVX Optimization]
 option(USE_AVX_OPTIMIZATION "AVX optimization support" OFF)
 option(USE_AVX2_OPTIMIZATION "AVX2 optimization support" OFF)
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index bf264352a4..0ad040d033 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -483,9 +483,52 @@ void downloadGridlistError( LLSD const &aData, std::string const &aURL )
 		LL_WARNS("SLGridStatusResponder") << "Error - output without </item>" << LL_ENDL;
 	}
 }
-
 // </FS:PP>
 
+// <FS:Ansariel> Check for test build expiration
+bool is_testbuild_expired()
+{
+#if TESTBUILD
+	std::string datestr = __DATE__;
+
+	std::istringstream iss_date(datestr);
+	std::string str_month;
+	S32 day;
+	S32 year;
+	S32 month = 1;
+	iss_date >> str_month >> day >> year;
+
+	if (str_month == "Jan") month = 1;
+	else if (str_month == "Feb") month = 2;
+	else if (str_month == "Mar") month = 3;
+	else if (str_month == "Apr") month = 4;
+	else if (str_month == "May") month = 5;
+	else if (str_month == "Jun") month = 6;
+	else if (str_month == "Jul") month = 7;
+	else if (str_month == "Aug") month = 8;
+	else if (str_month == "Sep") month = 9;
+	else if (str_month == "Oct") month = 10;
+	else if (str_month == "Nov") month = 11;
+	else if (str_month == "Dec") month = 12;
+
+	tm t = {0};
+	t.tm_mon = month - 1;
+	t.tm_mday = day;
+	t.tm_year = year - 1900;
+	t.tm_hour = 0;
+	t.tm_min = 0;
+	t.tm_sec = 0;
+
+	time_t expiry_time = mktime(&t) + (S32(TESTBUILDPERIOD) + 1) * 24 * 60 * 60;
+	time_t current_time = time(NULL);
+
+	return current_time > expiry_time;
+#else
+	return false;
+#endif
+}
+// </FS:Ansariel>
+
 void update_texture_fetch()
 {
 	LLAppViewer::getTextureCache()->update(1); // unpauses the texture cache thread
@@ -1160,6 +1203,17 @@ bool idle_startup()
 
 	if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())
 	{
+		// <FS:Ansariel> Check for test build expiration
+		if (is_testbuild_expired())
+		{
+			LL_INFOS() << "This test version has expired and cannot be used any further." << LL_ENDL;
+			LLNotificationsUtil::add("TestversionExpired", LLSD(), LLSD(), login_alert_done);
+			LLStartUp::setStartupState(STATE_LOGIN_CONFIRM_NOTIFICATON);
+			show_connect_box = true;
+			return FALSE;
+		}
+		// </FS:Ansariel>
+
 		// <FS:Ansariel> Login block
 		LLSD blocked = FSData::instance().allowedLogin();
 		if (blocked.isMap()) //hack for testing for an empty LLSD
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 0ff867f9ad..e9048ad8bf 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -4733,6 +4733,12 @@ Dieses wird die folgenden Informationen an die aktuelle IM-Sitzung senden:
      name="okbutton"
      yestext="OK"/>
   </notification>
+  <notification name="TestversionExpired">
+    Diese Testversion von [APP_NAME] is abgelaufen und kann nicht weiter verwendet werden.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
 
   <notification name="FireStormReqInfo">
 [NAME] hat die eine Anfrage geschickt, Informationen über Ihre [APP_NAME]-Konfiguration zu übermitteln.
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7622be4256..53b4983361 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10266,6 +10266,16 @@ This will send the following information to the current IM session:
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="TestversionExpired"
+   type="alertmodal">
+    This test version of [APP_NAME] has expired and cannot be used any further.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="FireStormReqInfo"
diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
index fac6f5f159..fbf43c59e2 100755
--- a/scripts/configure_firestorm.sh
+++ b/scripts/configure_firestorm.sh
@@ -37,6 +37,7 @@ WANTS_FMODEX=$FALSE
 WANTS_OPENSIM=$TRUE
 WANTS_AVX=$FALSE
 WANTS_AVX2=$FALSE
+WANTS_TESTBUILD=$FALSE
 WANTS_BUILD=$FALSE
 PLATFORM="darwin" # darwin, win32, win64, linux32, linux64
 BTYPE="Release"
@@ -44,6 +45,7 @@ CHANNEL="" # will be overwritten later with platform-specific values unless manu
 LL_ARGS_PASSTHRU=""
 JOBS="0"
 WANTS_NINJA=$FALSE
+TESTBUILD_PERIOD="0"
 
 ###
 ### Helper Functions
@@ -70,6 +72,7 @@ showUsage()
     echo "  --no-opensim : Build without OpenSim support (Overrides --opensim)"
     echo "  --avx        : Build with Advanced Vector Extensions"
     echo "  --avx2       : Build with Advanced Vector Extensions 2"
+    echo "  --testbuild <period> : Create time-limited test build"
     echo "  --platform   : darwin | win32 | win64 | linux32 | linux64"
     echo "  --jobs <num> : Build with <num> jobs in parallel (Linux and Darwin only)"
     echo
@@ -81,7 +84,7 @@ getArgs()
 # $* = the options passed in from main
 {
     if [ $# -gt 0 ]; then
-      while getoptex "clean build config version package no-package fmodex ninja jobs: platform: kdu quicktime opensim no-opensim avx avx2 help chan: btype:" "$@" ; do
+      while getoptex "clean build config version package no-package fmodex ninja jobs: platform: kdu quicktime opensim no-opensim avx avx2 testbuild: help chan: btype:" "$@" ; do
 
           #insure options are valid
           if [  -z "$OPTOPT"  ] ; then
@@ -104,6 +107,8 @@ getArgs()
           no-opensim) WANTS_OPENSIM=$FALSE;;
           avx)        WANTS_AVX=$TRUE;;
           avx2)       WANTS_AVX2=$TRUE;;
+          testbuild)  WANTS_TESTBUILD=$TRUE
+                      TESTBUILD_PERIOD="$OPTARG";;
           package)    WANTS_PACKAGE=$TRUE;;
           no-package) WANTS_PACKAGE=$FALSE;;
           build)      WANTS_BUILD=$TRUE;;
@@ -278,8 +283,9 @@ echo -e "    PLATFORM: '$PLATFORM'"            | tee -a $LOG
 echo -e "         KDU: `b2a $WANTS_KDU`"       | tee -a $LOG
 echo -e "      FMODEX: `b2a $WANTS_FMODEX`"    | tee -a $LOG
 echo -e "     OPENSIM: `b2a $WANTS_OPENSIM`"   | tee -a $LOG
-echo -e "         AVX: `b2a $WANTS_AVX` "      | tee -a $LOG
-echo -e "        AVX2: `b2a $WANTS_AVX2` "     | tee -a $LOG
+echo -e "         AVX: `b2a $WANTS_AVX`"       | tee -a $LOG
+echo -e "        AVX2: `b2a $WANTS_AVX2`"      | tee -a $LOG
+echo -e "   TESTBUILD: `b2a $WANTS_TESTBUILD`" | tee -a $LOG
 echo -e "     PACKAGE: `b2a $WANTS_PACKAGE`"   | tee -a $LOG
 echo -e "       CLEAN: `b2a $WANTS_CLEAN`"     | tee -a $LOG
 echo -e "       BUILD: `b2a $WANTS_BUILD`"     | tee -a $LOG
@@ -391,6 +397,11 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
     else
         AVX2_OPTIMIZATION="-DUSE_AVX2_OPTIMIZATION:BOOL=OFF"
     fi
+    if [ $WANTS_TESTBUILD -eq $TRUE ] ; then
+        TESTBUILD="-DTESTBUILD:BOOL=ON -DTESTBUILDPERIOD:STRING=$TESTBUILD_PERIOD"
+    else
+        TESTBUILD="-DTESTBUILD:BOOL=OFF"
+    fi
     if [ $WANTS_PACKAGE -eq $TRUE ] ; then
         PACKAGE="-DPACKAGE:BOOL=ON"
         # Also delete easy-to-copy resource files, insuring that we properly refresh resoures from the source tree
@@ -446,7 +457,7 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
         UNATTENDED="-DUNATTENDED=ON"
     fi
 
-    cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $KDU $OPENSIM $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=$WORD_SIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
+    cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $KDU $OPENSIM $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $TESTBUILD $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=$WORD_SIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
           -DNDTARGET_ARCH:STRING="${TARGET_ARCH}" -DROOT_PROJECT_NAME:STRING=Firestorm $LL_ARGS_PASSTHRU | tee $LOG
 
     if [ $PLATFORM == "win32" ] ; then

From e27bc472b729a892a090c5d1164af977249a719f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 30 Nov 2016 16:53:00 +0100
Subject: [PATCH 4/5] FIRE-20436: Remove broken "render muted avatars as
 particle cloud" option that is screwing up the rendering pipeline anyway

---
 indra/newview/CMakeLists.txt                  |   1 -
 indra/newview/app_settings/cloud_muted.xml    | 108 ------------------
 indra/newview/app_settings/settings.xml       |  12 --
 indra/newview/llvoavatar.cpp                  |  37 +-----
 indra/newview/llvoavatar.h                    |   4 -
 .../default/xui/de/panel_preferences_move.xml |   1 -
 .../default/xui/en/panel_preferences_move.xml |  11 --
 .../default/xui/es/panel_preferences_move.xml |   1 -
 .../default/xui/fr/panel_preferences_move.xml |   1 -
 .../default/xui/it/panel_preferences_move.xml |   1 -
 .../default/xui/ja/panel_preferences_move.xml |   1 -
 .../default/xui/pl/panel_preferences_move.xml |   1 -
 .../default/xui/ru/panel_preferences_move.xml |   1 -
 13 files changed, 4 insertions(+), 176 deletions(-)
 delete mode 100644 indra/newview/app_settings/cloud_muted.xml

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 98627562d9..62946cfb8d 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1916,7 +1916,6 @@ set(viewer_APPSETTINGS_FILES
     app_settings/autoreplace.xml
     app_settings/client_list_v2.xml
     app_settings/cloud.xml
-    app_settings/cloud_muted.xml
     app_settings/cmd_line.xml
     app_settings/commands.xml
     app_settings/foldertypes.xml
diff --git a/indra/newview/app_settings/cloud_muted.xml b/indra/newview/app_settings/cloud_muted.xml
deleted file mode 100644
index 765c7239c6..0000000000
--- a/indra/newview/app_settings/cloud_muted.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<llsd>
-    <map>
-
-
-<!-- Settings for the whole particle system -->
-
-    <key>SourceMaxAge</key><!-- how long the source can live with 0 forever -->
-        <real>0</real>
-    <key>SourceStartAge</key>
-        <real>0</real>
-
-    <key>AngularVelocity</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-        </array>
-    <key>InnerAngle</key>
-        <real>3.1415927410125732421875</real>
-    <key>OuterAngle</key>
-        <real>0</real>
-
-    <key>BurstPartCount</key>
-        <integer>1</integer>
-    <key>BurstRadius</key>
-        <real>0.3</real>
-    <key>BurstRate</key>
-        <real>0.02</real>
-    <key>BurstSpeedMin</key>
-        <real>0.1</real>
-    <key>BurstSpeedMax</key>
-        <real>1</real>
-
-    <!-- pattern flags set to 1 for true and 0 for false -->
-    <key>LL_PART_SRC_PATTERN_ANGLE</key>
-        <integer>0</integer>
-    <key>LL_PART_SRC_PATTERN_ANGLE_CONE</key>
-        <integer>1</integer>
-    <key>LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY</key>
-        <integer>0</integer>
-    <key>LL_PART_SRC_PATTERN_DROP</key>
-        <integer>0</integer>
-    <key>LL_PART_SRC_PATTERN_EXPLODE</key>
-        <integer>1</integer>
-    <!-- end of pattern flags -->
-
-<!-- Settings for single particles within the  system -->
-
-    <key>ParticleMaxAge</key><!-- how long a single particle can live with 0 forever -->
-        <real>4</real>
-
-    <key>PartImageID</key> <!--This setting is ignored for the cloud, used instead for now is the hardcoded -->
-        <string>0000000000000-0000-0000-000000000000</string><!-- skins/default/textures/cloud-particle.j2c -->
-
-    <key>StartColor</key><!-- RGBA -->
-        <array>
-            <real>0.13</real>
-            <real>0.78</real>
-            <real>0.13</real>
-            <real>0.3</real>
-        </array>
-    <key>EndColor</key><!-- RGBA -->
-        <array>
-            <real>0.13</real>
-            <real>0.39</real>
-            <real>0.13</real>
-            <real>0.1</real>
-        </array>
-
-    <key>StartScale</key>
-        <array>
-            <real>0.8</real>
-            <real>0.8</real>
-        </array>
-    <key>EndScale</key>
-        <array>
-            <real>0.01</real>
-            <real>0.01</real>
-        </array>
-
-    <key>TargetId</key><!-- This setting is ignored for the cloud -->
-        <string>00000000-0000-0000-0000-000000000000</string>
-
-    <!-- masks flags set to 1 for true and 0 for false-->
-    <key>LL_PART_BEAM_MASK</key>
-        <integer>0</integer>
-    <key>LL_PART_BOUNCE_MASK</key>
-        <integer>0</integer>
-    <key>LL_PART_EMISSIVE_MASK</key>
-        <integer>1</integer>
-    <key>LL_PART_FOLLOW_SRC_MASK</key>
-        <integer>0</integer>
-    <key>LL_PART_FOLLOW_VELOCITY_MASK</key>
-        <integer>0</integer>
-    <key>LL_PART_INTERP_COLOR_MASK</key>
-        <integer>1</integer>
-    <key>LL_PART_INTERP_SCALE_MASK</key>
-        <integer>1</integer>
-    <key>LL_PART_TARGET_LINEAR_MASK</key>
-        <integer>0</integer>
-    <key>LL_PART_TARGET_POS_MASK</key>
-        <integer>1</integer>
-    <key>LL_PART_WIND_MASK</key>
-        <integer>1</integer>
-   <!-- end of mask flags -->
-
-    </map>
-</llsd>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ab4bd4c515..fbda24deca 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -177,18 +177,6 @@
     <key>Value</key>
     <string/>
   </map>
-
-  <key>ShowMutedAvatarsAsCloud</key>
-  <map>
-    <key>Comment</key>
-    <string>If true, show muted avatars as clouds.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>FSShowDummyAVsinRadar</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 2555f1a224..eef34f50f4 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -696,7 +696,6 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 	mTyping(FALSE),
 	mMeshValid(FALSE),
 	mVisible(FALSE),
-	mMutedAsCloud(false), // <FS:Ansariel> Show muted avatars as cloud
 	mWindFreq(0.f),
 	mRipplePhase( 0.f ),
 	mBelowWater(FALSE),
@@ -1191,7 +1190,6 @@ void LLVOAvatar::cleanupClass()
 }
 
 LLPartSysData LLVOAvatar::sCloud;
-LLPartSysData LLVOAvatar::sCloudMuted;
 void LLVOAvatar::initCloud()
 {
 	// fancy particle cloud designed by Brent
@@ -1229,11 +1227,6 @@ void LLVOAvatar::initCloud()
 	// llifstream in_file_muted(filename);
 	llifstream in_file_muted(filename.c_str());
 	// </FS:ND>
-
-	LLSDSerialize::fromXMLDocument(cloud_muted, in_file_muted);
-	sCloudMuted.fromLLSD(cloud_muted);
-	LLViewerTexture* cloud_muted_texture = LLViewerTextureManager::getFetchedTextureFromFile("cloud-particle.j2c");
-	sCloudMuted.mPartImageID = cloud_muted_texture->getID();
 }
 
 void LLVOAvatar::initInstance(void)
@@ -2248,11 +2241,6 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, const F64 &time)
 	// attach objects that were waiting for a drawable
 	lazyAttach();
 
-	// <FS:Ansariel> Show muted avatars as cloud
-	static LLUICachedControl<bool> showMutedAvatarsAsCloud("ShowMutedAvatarsAsCloud", false);
-	mMutedAsCloud = !isSelf() && showMutedAvatarsAsCloud && isInMuteList();
-	// </FS:Ansariel>
-	
 	// animate the character
 	// store off last frame's root position to be consistent with camera position
 	mLastRootPos = mRoot->getWorldPosition();
@@ -2714,14 +2702,7 @@ void LLVOAvatar::idleUpdateLoadingEffect()
 			// Firestorm Clouds
 			if (!isTooComplex()) // do not generate particles for overly-complex avatars
 			{
-				if (mMutedAsCloud)
-				{
-					setParticleSource(sCloudMuted, getID());
-				}
-				else
-				{
-					setParticleSource(sCloud, getID());
-				}
+				setParticleSource(sCloud, getID());
 			}
 		}
 // </FS>
@@ -7034,9 +7015,6 @@ bool LLVOAvatar::getIsCloud() const
 				|| !isTextureDefined(TEX_UPPER_BAKED)
 				|| !isTextureDefined(TEX_HEAD_BAKED)
 				)
-			// <FS> Show muted avatars as cloud
-			|| mMutedAsCloud
-			// </FS>
 			);
 }
 
@@ -7061,10 +7039,7 @@ void LLVOAvatar::updateRezzedStatusTimers()
 				startPhase("first_load_" + LLVOAvatar::rezStatusToString(i));
 			}
 		}
-		// <FS:Ansariel> Show muted avatars as cloud
-		//if (rez_status < mLastRezzedStatus)
-		if (rez_status < mLastRezzedStatus && !mMutedAsCloud)
-		// </FS:Ansariel>
+		if (rez_status < mLastRezzedStatus)
 		{
 			// load level has decreased. start phase timers for higher load levels.
 			for (S32 i = rez_status+1; i <= mLastRezzedStatus; i++)
@@ -7230,10 +7205,7 @@ BOOL LLVOAvatar::updateIsFullyLoaded()
 
 void LLVOAvatar::updateRuthTimer(bool loading)
 {
-	// <FS:Ansariel> Show muted avatars as cloud
-	//if (isSelf() || !loading) 
-	if (isSelf() || !loading || !mMutedAsCloud) 
-	// </FS:Ansariel>
+	if (isSelf() || !loading) 
 	{
 		return;
 	}
@@ -7301,8 +7273,7 @@ BOOL LLVOAvatar::isFullyLoaded() const
 //	return (mRenderUnloadedAvatar || mFullyLoaded);
 // [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-22 (Catznip-2.2)
 	// Changes to LLAppearanceMgr::updateAppearanceFromCOF() expect this function to actually return mFullyLoaded for gAgentAvatarp
-	//return (mRenderUnloadedAvatar && !isSelf()) ||(mFullyLoaded);
-	return (mRenderUnloadedAvatar && !isSelf() && !mMutedAsCloud) ||(mFullyLoaded); // Particle clouds!
+	return (mRenderUnloadedAvatar && !isSelf()) ||(mFullyLoaded);
 // [/SL:KB]
 }
 
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 08a5cc643e..984a13acfd 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -236,9 +236,6 @@ public:
 private: //aligned members
 	LL_ALIGN_16(LLVector4a	mImpostorExtents[2]);
 
-	// <FS:Ansariel> Show muted avatars as cloud
-	bool			mMutedAsCloud;
-
 	//--------------------------------------------------------------------
 	// Updates
 	//--------------------------------------------------------------------
@@ -310,7 +307,6 @@ public:
 	static BOOL		sJointDebug; // output total number of joints being touched for each avatar
 	static BOOL		sDebugAvatarRotation;
 	static LLPartSysData sCloud;
-	static LLPartSysData sCloudMuted;
 
 	//--------------------------------------------------------------------
 	// Region state
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_move.xml b/indra/newview/skins/default/xui/de/panel_preferences_move.xml
index fae529d242..1213cb064b 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_move.xml
@@ -25,7 +25,6 @@
 				(Erfordert Neustart)
 			</text>
 			<check_box label="Kamera-Kontrollen auf undurchsichtigem Hintergrund anzeigen" name="FSAlwaysOpaqueCameraControls"/>
-			<check_box label="Blockierte Avatare als Partikelwolke darstellen" name="ShowMutedAvatarsAsCloud" tool_tip="Blockierte Avatare werden als Partikelwolke in einer speziellen Farbe dargestellt."/>
 			<check_box label="Temporär nicht-angezeigte Objekte nach Teleport wieder darstellen" name="FSTempDerenderUntilTeleport" tool_tip="Falls aktiviert, werden temporär nicht-angezeigte Objekte nach einem Teleport wieder dargestellt. Falls deaktiviert, werden diese bis zum Ende der Sitzung nicht dargestellt, sofern sie nicht manuell mit Hilfe des Asset-Blacklist-Fensters wieder dargestellt werden sollen."/>
 		</panel>
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 80e6726767..0268704132 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -264,17 +264,6 @@
          name="FSAlwaysOpaqueCameraControls"
          width="350"
          control_name="FSAlwaysOpaqueCameraControls"/>
-        <check_box
-         top_pad="3"
-         follows="left|top"
-         height="16"
-         label="Render blocked avatars as particle cloud"
-         layout="topleft"
-         left="20"
-         name="ShowMutedAvatarsAsCloud"
-         width="350"
-         tool_tip="Blocked avatars will be rendered as a particle cloud in special color."
-         control_name="ShowMutedAvatarsAsCloud"/>
         <check_box
          top_pad="3"
          follows="left|top"
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_move.xml b/indra/newview/skins/default/xui/es/panel_preferences_move.xml
index fd9c8e6723..07f3f8079c 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_move.xml
@@ -24,7 +24,6 @@
 				(requiere reiniciar)
 			</text>
 			<check_box label="Muestra los controles de cámara por defecto siempre opacos" name="FSAlwaysOpaqueCameraControls"/>
-			<check_box label="Representar avatares bloqueados como nubes de partículas" name="ShowMutedAvatarsAsCloud" tool_tip="Los avatares bloqueados se mostrarán como nubes de partículas de un color especial"/>
 		</panel>
 		<panel label="Vista subjetiva" name="tab-mouselook">
 			<check_box label="Activar la funcionalidad de vista subjetiva" name="EnableMouselook" tool_tip="Permite una perspectiva de primera persona y el contról de la cámara con el ratón"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml
index d137828b1d..887fc7662c 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml
@@ -20,7 +20,6 @@
 			<check_box label="Permettre à la caméra de traverser les objets" name="ignorecameraconstraints" tool_tip="Ignore les déplacements de caméra que le simulateur effectue lorsque celle-ci s'approche trop près des objets."/>
 			<text name="ignorecameraconstraints_requires_restart">(Redémarrage requis)</text>
 			<check_box label="Toujours afficher la fenêtre de contrôles de la caméra de façon opaque" name="FSAlwaysOpaqueCameraControls"/>
-			<check_box label="Afficher les avatars ignorés en tant que nuage" name="ShowMutedAvatarsAsCloud" tool_tip="Les avatars ignorés seront affichés en tant que petit nuage vert."/>
 		</panel>
 		<panel label="Vue subjective" name="tab-mouselook">
 			<check_box label="Activer la vue subjective" name="EnableMouselook" tool_tip="Permettre une vue à la première personne et un contrôle de la caméra à la souris"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_move.xml b/indra/newview/skins/default/xui/it/panel_preferences_move.xml
index 74d192ad67..7585b92438 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_move.xml
@@ -22,7 +22,6 @@
 			<text name="ignorecameraconstraints_requires_restart">
 				(Richiesto riavvio)
 			</text>
-			<check_box label="Gli avatar bloccati saranno visualizati come nuvole" name="ShowMutedAvatarsAsCloud" tool_tip="Gli avatar Bloccati saranno visualizati come nuvole di un colore speciale." />
 		</panel>
 		<!--Mouselook-->
 		<panel name="tab-mouselook" label="Mouselook">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
index 66ff6cf4d9..5c981686d4 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
@@ -28,7 +28,6 @@
 				（再起動が必要）
 			</text>
 			<check_box label="デフォルトのカメラコントロールのミニウィンドウを常に不透明で表示" name="FSAlwaysOpaqueCameraControls" />
-			<check_box label="ブロックしているアバターをパーティクルの雲で表示" name="ShowMutedAvatarsAsCloud" tool_tip="ブロックしているアバターは特別な色のパーティクルの雲で表示されるようになります。" />
 
 		</panel>
 
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
index 1e61beb96f..4bc97c731c 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
@@ -24,7 +24,6 @@
 				(wymaga restartu)
 			</text>
 			<check_box label="Pokazuj standardowe, małe okienko sterowania kamerą zawsze jako nieprzezroczyste" name="FSAlwaysOpaqueCameraControls"/>
-			<check_box label="Zablokowane awatary jako chmury cząsteczek" name="ShowMutedAvatarsAsCloud" tool_tip="Zablokowane awatary będą renderowane jako chmury cząsteczek o specjalnym kolorze."/>
 			<check_box label="Po teleportacji pokaż ponownie tymczasowo zderenderowane obiekty" name="FSTempDerenderUntilTeleport" tool_tip="Gdy włączysz tą opcję, to tymczasowo zderenderowane obiekty pozostaną niewidoczne do momentu teleportacji. Gdy ją wyłączysz, to pozostaną niewidoczne do końca sesji lub do momentu, gdy zostaną ręcznie zrenderowane ponownie przez okno czarnej listy zasobów danych." />
 		</panel>
 		<panel label="Widok pierwszoosobowy" name="tab-mouselook">
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
index dd9a666724..7c85c42635 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
@@ -24,7 +24,6 @@
 				(перезапуск)
 			</text>
 			<check_box label="Показывать стандартное окно управления камерой всегда прозрачным" name="FSAlwaysOpaqueCameraControls"/>
-			<check_box label="Показывать заблокированных аватаров как облако частиц" name="ShowMutedAvatarsAsCloud" tool_tip="Заблокированные аватары будут отображаться как облако частиц специального цвета"/>
 		</panel>
 		<panel label="От первого лица" name="tab-mouselook">
 			<check_box label="Включить функциональность вида от первого лица (Mouselook)" name="EnableMouselook" tool_tip="Разрешить вид от первого лица и контроль камеры мышью"/>

From c9e24326504ce47352d18bd29d5683e714915940 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 30 Nov 2016 19:32:03 +0100
Subject: [PATCH 5/5] FIRE-8633 / MAINT-2141: Go with the LL fix for now

---
 indra/newview/llenvmanager.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp
index b423f36eb8..559acd43a5 100644
--- a/indra/newview/llenvmanager.cpp
+++ b/indra/newview/llenvmanager.cpp
@@ -676,13 +676,18 @@ bool LLEnvManagerNew::useRegionSky()
 		return true;
 	}
 
-	// *TODO: Support fixed sky from region.
-
+	// Otherwise apply region day cycle/skies.
 	// <FS:Ansariel> Quickprefs integration
 	FloaterQuickPrefs::updateParam(QP_PARAM_SKY, PRESET_NAME_REGION_DEFAULT);
 
-	// Otherwise apply region day cycle.
 	LL_DEBUGS("Windlight") << "Applying region sky" << LL_ENDL;
+
+	// *TODO: Support fixed sky from region. Just do sky reset for now.
+	if (region_settings.getSkyMap().size() == 1)
+	{
+		// Region is set to fixed sky. Reset.
+		useSkyParams(region_settings.getSkyMap().beginMap()->second);
+	}
 	return useDayCycleParams(
 		region_settings.getWLDayCycle(),
 		LLEnvKey::SCOPE_REGION,