diff --git a/indra/newview/skins/default/xui/da/floater_preview_animation.xml b/indra/newview/skins/default/xui/da/floater_preview_animation.xml
index 436843decc..076e4efe82 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_animation.xml
@@ -3,9 +3,11 @@
 	<floater.string name="Title">
 		Animation: [NAME]
 	</floater.string>
-	<text name="desc txt">
-		Beskrivelse:
-	</text>
-	<button label="Afspil i verden" label_selected="Stop" name="Anim play btn" tool_tip="Vis denne animation så andre kan se den"/>
-	<button label="Afspil lokalt" label_selected="Stop" name="Anim audition btn" tool_tip="Vis denne animation så kun du kan se den"/>
+	<panel name="basic_info_panel">
+		<text name="desc txt">
+			Beskrivelse:
+		</text>
+		<button label="Afspil i verden" label_selected="Stop" name="Anim play btn" tool_tip="Vis denne animation så andre kan se den"/>
+		<button label="Afspil lokalt" label_selected="Stop" name="Anim audition btn" tool_tip="Vis denne animation så kun du kan se den"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
index 8dda7064d7..e39ffb239c 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
@@ -3,20 +3,23 @@
 	<floater.string name="Title">
 		Animation: [NAME]
 	</floater.string>
-	<text name="desc txt" width="90">
-		Beschreibung:
-	</text>
-	<line_editor name="desc"/>
-	<button label="Inworld abspielen" label_selected="Stopp" name="Inworld" tool_tip="Diese Animation so wiedergeben, dass andere sie sehen können."/>
-	<button label="Lokal wiedergeben" label_selected="Stopp" name="Locally" tool_tip="Diese Animation so wiedergeben, dass nur Sie sie sehen."/>
-	<text name="AdvancedStatsLeft">
+	<panel name="basic_info_panel">
+		<text name="desc txt" width="90">
+			Beschreibung:
+		</text>
+		<button label="Inworld abspielen" label_selected="Stopp" name="Inworld" tool_tip="Diese Animation so wiedergeben, dass andere sie sehen können."/>
+		<button label="Lokal wiedergeben" label_selected="Stopp" name="Locally" tool_tip="Diese Animation so wiedergeben, dass nur Sie sie sehen."/>
+	</panel>
+	<panel name="advanced_info_panel">
+		<text name="AdvancedStatsLeft">
 Priorität: [PRIORITY]
 Dauer: [DURATION]s
 Schleife: [IS_LOOP]
-	</text>
-	<text name="AdvancedStatsRight">
+		</text>
+		<text name="AdvancedStatsRight">
 Einblenden: [EASE_IN]s
 Ausblenden: [EASE_OUT]s
 Gelenke: [NUM_JOINTS]
-	</text>
+		</text>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
index fd7060448f..6d577518f9 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
@@ -3,9 +3,11 @@
 	<floater.string name="Title">
 		Animación: [NAME]
 	</floater.string>
-	<text name="desc txt">
-		Descripción:
-	</text>
-	<button label="Ver en el mundo" label_selected="Detener" name="Inworld" tool_tip="Ejecutar esta animación de modo que puedan verla los demás" width="130"/>
-	<button label="Ejecutarla para usted" label_selected="Detener" left="135" name="Locally" tool_tip="Ejecutar esta animación de modo que sólo la vea yo" width="130"/>
+	<panel name="basic_info_panel">
+		<text name="desc txt">
+			Descripción:
+		</text>
+		<button label="Ver en el mundo" label_selected="Detener" name="Inworld" tool_tip="Ejecutar esta animación de modo que puedan verla los demás" width="130"/>
+		<button label="Ejecutarla para usted" label_selected="Detener" left="135" name="Locally" tool_tip="Ejecutar esta animación de modo que sólo la vea yo" width="130"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
index 1ea55295b9..b01085540b 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_anim" width="350">
 	<floater.string name="Title">Animation : [NAME]</floater.string>
-	<text name="desc txt">Description :</text>
-	<line_editor name="desc" width="230" />
-	<button label="Jouer devant tout le monde" width="160" label_selected="Arrêter" name="Inworld" tool_tip="Jouer cette animation de façon à ce que les autres la voient"/>
-	<button label="Jouer localement" width="160" label_selected="Arrêter" name="Locally" tool_tip="Jouer cette animation de façon à ce que vous soyez la seule personne à la voir"/>
+	<panel name="basic_info_panel">
+		<text name="desc txt">Description :</text>
+		<line_editor name="desc" width="230" />
+		<button label="Jouer devant tout le monde" width="160" label_selected="Arrêter" name="Inworld" tool_tip="Jouer cette animation de façon à ce que les autres la voient"/>
+		<button label="Jouer localement" width="160" label_selected="Arrêter" name="Locally" tool_tip="Jouer cette animation de façon à ce que vous soyez la seule personne à la voir"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_preview_animation.xml b/indra/newview/skins/default/xui/it/floater_preview_animation.xml
index 64a8a9a8a2..0120285375 100644
--- a/indra/newview/skins/default/xui/it/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_animation.xml
@@ -3,9 +3,11 @@
 	<floater.string name="Title">
 		Animazione: [NAME]
 	</floater.string>
-	<text name="desc txt">
-		Descrizione:
-	</text>
-	<button label="Riproduci in mondo" label_selected="Ferma" name="Inworld" tool_tip="Riproduci questa animazione così che gli altri possano vederla"/>
-	<button label="Riproduci in locale" label_selected="Ferma" name="Locally" tool_tip="Riproduci questa animazione così che solo tu possa vederla"/>
+	<panel name="basic_info_panel">
+		<text name="desc txt">
+			Descrizione:
+		</text>
+		<button label="Riproduci in mondo" label_selected="Ferma" name="Inworld" tool_tip="Riproduci questa animazione così che gli altri possano vederla"/>
+		<button label="Riproduci in locale" label_selected="Ferma" name="Locally" tool_tip="Riproduci questa animazione così che solo tu possa vederla"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
index a3042f66ea..2ffffbbc47 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
@@ -3,9 +3,11 @@
 	<floater.string name="Title">
 		アニメーション： [NAME]
 	</floater.string>
-	<text name="desc txt">
-		説明：
-	</text>
-	<button label="インワールドで再生" label_selected="停止" name="Inworld" tool_tip="他人に見えるように再生"/>
-	<button label="ローカル再生" label_selected="停止" name="Locally" tool_tip="自分だけが見えるように再生"/>
+	<panel name="basic_info_panel">
+		<text name="desc txt">
+			説明：
+		</text>
+		<button label="インワールドで再生" label_selected="停止" name="Inworld" tool_tip="他人に見えるように再生"/>
+		<button label="ローカル再生" label_selected="停止" name="Locally" tool_tip="自分だけが見えるように再生"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
index 23bc933f2d..b245021f47 100644
--- a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
@@ -3,19 +3,24 @@
 	<floater.string name="Title">
 		Animacja: [NAME]
 	</floater.string>
-	<text name="desc txt">
-		Opis:
-	</text>
-	<button label="Uruchom publicznie" label_selected="Zatrzymaj" name="Inworld" tool_tip="Uruchom animację tak, aby widzieli ją pozostali Rezydenci"/>
-	<button label="Uruchom prywatnie" label_selected="Zatrzymaj" name="Locally" tool_tip="Uruchom animację tak, aby była ona widoczna tylko dla Ciebie"/>
-	<text name="AdvancedStatsLeft">
+	<panel name="basic_info_panel">
+		<text name="desc txt">
+			Opis:
+		</text>
+		<button label="Uruchom publicznie" label_selected="Zatrzymaj" name="Inworld" tool_tip="Uruchom animację tak, aby widzieli ją pozostali Rezydenci"/>
+		<button label="Uruchom prywatnie" label_selected="Zatrzymaj" name="Locally" tool_tip="Uruchom animację tak, aby była ona widoczna tylko dla Ciebie"/>
+		<button name="btn_expand" tool_tip="Rozwiń, aby zobaczyć zaawansowane informacje o tej animacji" />
+	</panel>
+	<panel name="advanced_info_panel">
+		<text name="AdvancedStatsLeft">
 Priorytet: [PRIORITY]
 Długość: [DURATION]s
 Zapętlona: [IS_LOOP]
-	</text>
-	<text name="AdvancedStatsRight">
+		</text>
+		<text name="AdvancedStatsRight">
 Wygł. startu: [EASE_IN]s
 Wygł. końca: [EASE_OUT]s
 Stawy: [NUM_JOINTS]
-	</text>
+		</text>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
index 4cf0b96f65..a5974ec2da 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
@@ -211,6 +211,7 @@
         <check_box label="Używaj CTRL+myszki, aby chwytać obiekty i manipulować nimi" tool_tip="Gdy zaznaczysz tą opcję, to będziesz w stanie chwytać i przesuwać obiekty za pomocą myszki oraz klawisza CTRL." name="FSEnableGrab" />
         <check_box label="Przesuwaj / skaluj tekstury budując, gdy trzymany jest przycisk myszy oraz klawisz caps-lock" tool_tip="Gdy zaznaczysz tą opcję, to będziesz mógł/mogła przesuwać lub skalować strony tekstur trzymając przycisk myszy (wraz z klawiszem caps-lock) w trybie budowania. Ta funkcja jest eksperymentalna i powinna być używana ostrożnie." name="FSExperimentalDragTexture" />
         <check_box label="Podgląd animacji na własnym awatarze podczas przesyłania ich na serwer" tool_tip="Gdy zaznaczysz tą opcję, to będziesz w stanie oglądać animacje na swoim własnym awatarze podczas przesyłania ich na serwer" name="FSUploadAnimationOnOwnAvatar" />
+		<check_box label="Zawsze rozwijaj zaawansowane informacje o podglądzie animacji" tool_tip="Domyślnie rozwiń zaawansowane informacje o animacji w oknie podglądu animacji" name="FSAnimationPreviewExpanded" />
         <check_box label="Włącz rozszerzanie funkcjonalności informacji o skryptach" tool_tip="Gdy zaznaczysz tą opcję, to podstawowa funkcjonalność informacji o skryptach zostanie rozszerzona za pomocą różnych szczegółów przydatnych dla budowniczych" name="FSScriptInfoExtended" />
     </panel>
     <panel label="Nowe pliki" name="UploadsTab">
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
index 19474d8099..9823192844 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
@@ -3,9 +3,11 @@
 	<floater.string name="Title">
 		Animação: [NOME]
 	</floater.string>
-	<text name="desc txt">
-		Descrição:
-	</text>
-	<button label="Tocar inworld" label_selected="Parar" name="Inworld" tool_tip="Executar essa animação de forma que outros possam ver"/>
-	<button label="Tocar localmente" label_selected="Parar" name="Locally" tool_tip="Executar animação de forma que apenas você possa ver"/>
+	<panel name="basic_info_panel">
+		<text name="desc txt">
+			Descrição:
+		</text>
+		<button label="Tocar inworld" label_selected="Parar" name="Inworld" tool_tip="Executar essa animação de forma que outros possam ver"/>
+		<button label="Tocar localmente" label_selected="Parar" name="Locally" tool_tip="Executar animação de forma que apenas você possa ver"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml
index 4703e1e616..8749110312 100644
--- a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml
@@ -3,19 +3,23 @@
 	<floater.string name="Title">
 		Анимация: [NAME]
 	</floater.string>
-	<text name="desc txt">
-		Описание:
-	</text>
-	<button label="Запустить публично" label_selected="Остановить" name="Inworld" tool_tip="Запустить анимацию аватара, чтоб ее видели все вокруг"/>
-	<button label="Запустить для себя" label_selected="Остановить" name="Locally" tool_tip="Запустить анимацию аватара, чтоб ее видели только вы"/>
-	<text name="AdvancedStatsLeft">
+	<panel name="basic_info_panel">
+		<text name="desc txt">
+			Описание:
+		</text>
+		<button label="Запустить публично" label_selected="Остановить" name="Inworld" tool_tip="Запустить анимацию аватара, чтоб ее видели все вокруг"/>
+		<button label="Запустить для себя" label_selected="Остановить" name="Locally" tool_tip="Запустить анимацию аватара, чтоб ее видели только вы"/>
+	</panel>
+	<panel name="advanced_info_panel">
+		<text name="AdvancedStatsLeft">
 Приоритет: [PRIORITY]
 Длительн.: [DURATION]с
 Цикл: [IS_LOOP]
-	</text>
-	<text name="AdvancedStatsRight">
+		</text>
+		<text name="AdvancedStatsRight">
 Запуск: [EASE_IN]с
 Останов: [EASE_OUT]с
 Суставы: [NUM_JOINTS]
-	</text>
+		</text>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml
index 23b4848333..7241b845a1 100644
--- a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml
@@ -3,9 +3,11 @@
 	<floater.string name="Title">
 		Animasyon: [NAME]
 	</floater.string>
-	<text name="desc txt">
-		Açıklama:
-	</text>
-	<button label="SL Dünyasında Oynat" label_selected="Durdur" name="Inworld" tool_tip="Bu animasyonu başkaları görebilecek şekilde oynatın"/>
-	<button label="Yerel Olarak Oynat" label_selected="Durdur" name="Locally" tool_tip="Bu animasyonu sadece kendinizin görebileceği şekilde oynatın"/>
+	<panel name="basic_info_panel">
+		<text name="desc txt">
+			Açıklama:
+		</text>
+		<button label="SL Dünyasında Oynat" label_selected="Durdur" name="Inworld" tool_tip="Bu animasyonu başkaları görebilecek şekilde oynatın"/>
+		<button label="Yerel Olarak Oynat" label_selected="Durdur" name="Locally" tool_tip="Bu animasyonu sadece kendinizin görebileceği şekilde oynatın"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
index b94d67b7ef..dacc2b3cc5 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
@@ -3,9 +3,11 @@
 	<floater.string name="Title">
 		動作：[NAME]
 	</floater.string>
-	<text name="desc txt">
-		描述：
-	</text>
-	<button label="在虛擬世界播放" label_selected="停止" name="Inworld" tool_tip="播放此動作讓他人看見"/>
-	<button label="在本地播放" label_selected="停止" name="Locally" tool_tip="播放此動作，只給自己看"/>
+	<panel name="basic_info_panel">
+		<text name="desc txt">
+			描述：
+		</text>
+		<button label="在虛擬世界播放" label_selected="停止" name="Inworld" tool_tip="播放此動作讓他人看見"/>
+		<button label="在本地播放" label_selected="停止" name="Locally" tool_tip="播放此動作，只給自己看"/>
+	</panel>
 </floater>