diff --git a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
index 95f6a17755..98907f9ac2 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
@@ -38,6 +38,7 @@
 			<combo_box.item label="Flug-Assistent: Extremer Boost" name="flight_extreme"/>
 		</combo_box>
 		<slider label="Überblendzeit für Umgebungseinstellungen:" tool_tip="Intervall in Sekunden in dem Änderungen an den Umgebungseinstellungen ineinander überblenden. 0 = direkt ohne Verzögerung" name="manual_environment_change_transition_period"/>
+		<check_box name="EnvironmentPersistAcrossLogin" label="Sitzungsübergreifende Umgebungseinstellungen aktivieren" tool_tip="Stellt die aktuellen Umgebungseinstellungen nach einem erneuten Login wieder her."/>
 	</panel>
 
 	<!--Protection-->
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index fd648d063f..9df6ad71c9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -183,21 +183,32 @@
              value="15.0" />
         </combo_box>
         <slider
-        name="manual_environment_change_transition_period"
-        control_name="FSEnvironmentManualTransitionTime"
-        label="Environment Transition Time:"
-        decimal_digits="1"
-        left="12"
-        top_pad="10"
-        follows="left|top"
-        layout="topleft"
-        height="18"
-        increment="0.5"
-        initial_value="0"
-        max_val="60"
-        min_val="0"
-        width="520"
-        tool_tip="Interval in seconds over which manual environment changes will blend. Zero is instant."/>
+         name="manual_environment_change_transition_period"
+         control_name="FSEnvironmentManualTransitionTime"
+         label="Environment Transition Time:"
+         decimal_digits="1"
+         left="12"
+         top_pad="15"
+         follows="left|top"
+         layout="topleft"
+         height="18"
+         increment="0.5"
+         initial_value="0"
+         max_val="60"
+         min_val="0"
+         width="520"
+         tool_tip="Interval in seconds over which manual environment changes will blend. Zero is instant."/>
+        <check_box
+         top_pad="5"
+         control_name="EnvironmentPersistAcrossLogin"
+         follows="left|top"
+         height="16"
+         initial_value="true"
+         name="EnvironmentPersistAcrossLogin"
+         label="Persist Environment settings throughout sessions"
+         left="10"
+         width="500"
+         tool_tip="Restores the current environment settings after next login."/>
     </panel>