diff --git a/indra/newview/llpanellandaudio.cpp b/indra/newview/llpanellandaudio.cpp
index e5a0d91bd0..e6af1df8ab 100644
--- a/indra/newview/llpanellandaudio.cpp
+++ b/indra/newview/llpanellandaudio.cpp
@@ -246,6 +246,7 @@ void LLPanelLandAudio::onBtnStreamAdd(LLUICtrl*, void *userdata)
 	if (!music_url.empty())
 	{
 		LLSD streamlist = gSavedSettings.getLLSD("FSStreamList");
+		streamlist["version"] = 1;
 		streamlist["audio"].append(music_url);
 		gSavedSettings.setLLSD("FSStreamList", streamlist);
 		self->refresh();
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 6bf25daf49..28b3d04738 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -131,14 +131,16 @@
 #include "fslslbridge.h"
 #include "fscommon.h"
 #include "fscontactsfloater.h"	// <FS:Zi> Display group list in contacts floater
+#include "fspose.h"	// <FS:CR> FIRE-4345: Undeform
 #include "fswsassetblacklist.h"
 #include "llavatarpropertiesprocessor.h"	// ## Zi: Texture Refresh
+#include "llsdserialize.h"
 #include "lltexturecache.h"	// ## Zi: Texture Refresh
 #include "lllogininstance.h"	// <FS:AW  opensim destinations and avatar picker>
 #include "llvovolume.h"
 #include "particleeditor.h"
 #include "piemenu.h"	// ## Zi: Pie Menu
-#include "fspose.h"	// <FS:CR> FIRE-4345: Undeform
+
 
 using namespace LLAvatarAppearanceDefines;
 
@@ -8678,6 +8680,57 @@ class FSToolsUndeform : public view_listener_t
 };
 // </FS:CR> FIRE-4345: Undeform
 
+// <FS:CR> Stream list import/export
+class FSStreamListExportXML :public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		LLFilePicker& file_picker = LLFilePicker::instance();
+		if(file_picker.getSaveFile(LLFilePicker::FFSAVE_XML, LLDir::getScrubbedFileName("stream_list.xml")))
+		{
+			std::string filename = file_picker.getFirstFile();
+			llofstream export_file(filename);
+			LLSDSerialize::toPrettyXML(gSavedSettings.getLLSD("FSStreamList"), export_file);
+			export_file.close();
+			LLSD args;
+			args["FILENAME"] = filename;
+			LLNotificationsUtil::add("StreamListExportSuccess", args);
+		}
+		else
+			llinfos << "User closed the filepicker. Aborting!" << llendl;
+
+		return true;
+	}
+};
+
+class FSStreamListImportXML :public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		LLFilePicker& file_picker = LLFilePicker::instance();
+		if(file_picker.getOpenFile(LLFilePicker::FFLOAD_XML))
+		{
+			std::string filename = file_picker.getFirstFile();
+			llifstream stream_list(filename);
+			if(!stream_list.is_open())
+			{
+				llwarns << "Couldn't open the xml file for reading. Aborting import!" << llendl;
+				return true;
+			}
+			LLSD stream_data;
+			if(LLSDSerialize::fromXML(stream_data, stream_list) >= 1)
+			{
+				gSavedSettings.setLLSD("FSStreamList", stream_data);
+				LLNotificationsUtil::add("StreamListImportSuccess");
+			}
+			stream_list.close();
+		}
+		
+		return true;
+	}
+};
+// </FS:CR> Stream list import/export
+
 class LLToolsSelectOnlyMyObjects : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
@@ -10354,4 +10407,8 @@ void initialize_menus()
 
 	// <FS:Ansariel> Script debug floater
 	commit.add("ShowScriptDebug", boost::bind(&LLFloaterScriptDebug::show, LLUUID::null));
+	
+	// <FS:CR> Stream list import/export
+	view_listener_t::addMenu(new FSStreamListExportXML(), "Streamlist.xml_export");
+	view_listener_t::addMenu(new FSStreamListImportXML(), "Streamlist.xml_import");
 }
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 1761a4a9a9..8dfd26c056 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -7916,7 +7916,9 @@ void LLVOAvatar::dumpArchetypeXML(const std::string& prefix, bool group_by_weara
 	// File will close when handle goes out of scope
 // <FS:CR> FIRE-8893 - Dump archetype xml to user defined location
 	LL_INFOS("DumpArchetypeXML") << "Archetype xml written successfully!" << LL_ENDL;
-	LLNotificationsUtil::add("DumpArchetypeSuccess");
+	LLSD args;
+	args["FILENAME"] = outfilename;
+	LLNotificationsUtil::add("DumpArchetypeSuccess", args);
 // </FS:CR>
 }
 
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 633be11f45..f99c66cbec 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -311,6 +311,10 @@
 			<menu_item_check label="Anziehen ersetzt nicht-gesperrte Kleidung" name="Wear Replaces Unlocked"/>
 			<menu_item_check label="Beschränkungen..." name="Restrictions"/>
 		</menu>
+		<menu label="Medien-Stream-Backup" name="media_stream_import_export">
+			<menu_item_call label="XML mit Medien-Stream importieren..." name="media_stream_import"/>
+			<menu_item_call label="Medien-Stream als XML exportieren..." name="media_stream_export"/>
+		</menu>
 		<menu_item_check label="Plugin-Read-Thread verwenden" name="Use Plugin Read Thread"/>
 		<menu_item_call label="Gruppen-Cache löschen" name="ClearGroupCache"/>
 		<menu_item_check label="Weiche Mausbewegung" name="Mouse Smoothing"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 6adf44f91b..a96d9b50a2 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -3891,7 +3891,15 @@ Einige Funktionen wie [FEATURE] sind nicht in [APP_NAME] für OpenSimulator enth
 	</notification>
 
 	<notification name="DumpArchetypeSuccess">
-Aussehen erfolgreich nach XML exportiert.
+Aussehen erfolgreich als XML nach [FILENAME] exportiert.
+	</notification>
+
+	<notification name="StreamListExportSuccess">
+Stream-Liste erfolgreich als XML nach [FILENAME] exportiert.
+	</notification>
+
+	<notification name="StreamListImportSuccess">
+Stream-Liste erfolgreich aus XML importiert.
 	</notification>
 
 	<notification name="BackupFinished">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e1c73f44aa..a25d0d7f5d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2495,6 +2495,23 @@
          name="RLVa Embedded"
          tear_off="true"
          visible="true" />
+		<menu
+			label="Media Streams Backup"
+			name="media_stream_import_export"
+			tear_off="true">
+			<menu_item_call
+				label="Import Stream List XML..."
+				name="media_stream_import">
+                <menu_item_call.on_click
+				function="Streamlist.xml_import" />
+            </menu_item_call>
+			<menu_item_call
+				label="Export Stream List XML..."
+				name="media_stream_export">
+                <menu_item_call.on_click
+				function="Streamlist.xml_export" />
+            </menu_item_call>
+		</menu>
         <menu_item_check
          label="Use Plugin Read Thread"
          name="Use Plugin Read Thread">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index bc346bcda1..d4751b28c7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11082,7 +11082,21 @@ Error in the regular expression:
 		icon="notify.tga"
 		name="DumpArchetypeSuccess"
 		type="notify">
-		Successfully saved appearance to XML.
+		Successfully saved appearance to XML to [FILENAME].
+	</notification>
+	
+	<notification
+		icon="notify.tga"
+		name="StreamListExportSuccess"
+		type="notify">
+		Successfully exported stream list to XML to [FILENAME].
+	</notification>
+	
+	<notification
+		icon="notify.tga"
+		name="StreamListImportSuccess"
+		type="notify">
+		Successfully imported stream list from XML.
 	</notification>
 	
    <!-- <FS:Zi> Backup Settings -->
diff --git a/indra/newview/skins/default/xui/es/floater_environment_settings.xml b/indra/newview/skins/default/xui/es/floater_environment_settings.xml
index f256c7efe9..5b5401648d 100644
--- a/indra/newview/skins/default/xui/es/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_environment_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="CONFIGURACIÓN DE ENTORNO">
+<floater name="Environment Editor Floater" title="Configuración de entorno">
 	<check_box label="Usar siempre esta configuración:" name="use_env_from_region_always" tool_tip="Si marcas esta opción, siempre se usarán las configuraciones de abajo."/>
 	<radio_group name="region_settings_radio_group">
 		<radio_item label="Usar configuración de región" name="use_region_settings"/>
diff --git a/indra/newview/skins/default/xui/es/floater_fs_volume_controls.xml b/indra/newview/skins/default/xui/es/floater_fs_volume_controls.xml
new file mode 100644
index 0000000000..5a12d65fee
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_fs_volume_controls.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="volume_controls" title="Controles de volumen"/>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
index 6758b052fa..2f1441a711 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
@@ -21,4 +21,6 @@
 	<menu_item_call label="Expulsar de la finca y prohibir acceso" name="kick"/>
 	<menu_item_call label="Enviar a su casa" name="teleport_home"/>
 	<menu_item_call label="Expulsar del estado" name="estate_ban"/>
+	<menu_item_call label="Desdibujar" name="derender"/>
+	<menu_item_call label="Desdibujar + lista negra" name="derender_permanent"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
index dfb3d310bf..983d2ca8d9 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
@@ -12,4 +12,6 @@
 	<menu_item_call label="Patear" name="kick"/>
 	<menu_item_call label="Enviar a su casa" name="teleport_home"/>
 	<menu_item_call label="Expulsar del estado" name="estate_ban"/>
+	<menu_item_call label="Desdibujar" name="derender"/>
+	<menu_item_call label="Desdibujar + lista negra" name="derender_permanent"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 23495e5749..2e7297dd75 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -289,6 +289,10 @@
 			<menu_item_check label="Objetos flexibles" name="Flexible Objects"/>
 		</menu>
 		<menu label="RLVa" name="RLVa Embedded"/>
+		<menu label="Respaldo de flujos de medios" name="media_stream_import_export">
+			<menu_item_call label="Importar lista de flujos en XML..." name="media_stream_import"/>
+			<menu_item_call label="Exportar lista de flujos a XML..." name="media_stream_export"/>
+		</menu>
 		<menu_item_check label="Usar Plugin Read Thread" name="Use Plugin Read Thread"/>
 		<menu_item_call label="Vaciar caché de grupo" name="ClearGroupCache"/>
 		<menu_item_check label="Vista subjetiva suavizada" name="Mouse Smoothing"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 8cba492a5a..f4dbc95d71 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -4489,7 +4489,13 @@ Simulador anterior: [OLDVERSION]
 		</form>
 	</notification>
 	<notification name="DumpArchetypeSuccess">
-		Apariencia guardada con éxito en XML.
+		Apariencia guardada con éxito en XML en [FILENAME].
+	</notification>
+	<notification name="StreamListExportSuccess">
+		Lista de flujos exportada con éxito en archivo XML [FILENAME].
+	</notification>
+	<notification name="StreamListImportSuccess">
+		Lista de flujos importada con éxito de archivo XML.
 	</notification>
 	<notification name="BackupFinished">
 		Tu configuración ha sido respaldada.