diff --git a/indra/newview/fspanelface.cpp b/indra/newview/fspanelface.cpp
index 55f54f47ba..5279ab85d4 100644
--- a/indra/newview/fspanelface.cpp
+++ b/indra/newview/fspanelface.cpp
@@ -1517,14 +1517,7 @@ void FSPanelFace::updateUI(bool force_set_values /*false*/)
         mTabsPBRMatMedia->enableTabButton(
             mTabsPBRMatMedia->getIndexForPanel(
                 mTabsPBRMatMedia->getPanelByName("panel_material_type_blinn_phong")), editable );
-        if(!has_pbr_material)
-        {
-            mTabsPBRMatMedia->selectTabByName("panel_material_type_blinn_phong");
-        }
-        else
-        {
-            mTabsPBRMatMedia->selectTabByName("panel_material_type_pbr");
-        }
+
         // only turn on auto-adjust button if there is a media renderer and the media is loaded
         mBtnAlignMedia->setEnabled(editable);
 
diff --git a/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml
index 2771c6f9e1..86003c37e6 100644
--- a/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml
@@ -112,6 +112,7 @@
 				<combo_box.item value="filter_type_snapshots" label="Zdjęcia" />
 				<combo_box.item value="filter_type_materials" label="Materiały" />
 				<combo_box.item value="filter_type_settings" label="Otoczenia" />
+				<combo_box.item value="filter_type_folders" label="Foldery" />
 				<combo_box.item value="filter_type_coalesced" label="Tylko podniesione razem" />
 				<combo_box.item value="filter_type_custom" label="Własny filtr..." />
 			</combo_box>
diff --git a/indra/newview/skins/ansastorm/xui/zh/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/zh/panel_main_inventory.xml
index 65d65fa22c..21f086793b 100644
--- a/indra/newview/skins/ansastorm/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/zh/panel_main_inventory.xml
@@ -111,8 +111,9 @@
 				<combo_box.item value="filter_type_sounds" label="聲音" />
 				<combo_box.item value="filter_type_textures" label="紋理" />
 				<combo_box.item value="filter_type_snapshots" label="快照" />
-				<combo_box.item value="filter_type_settings" label="環境設定" />
 				<combo_box.item value="filter_type_materials" label="材質" />
+				<combo_box.item value="filter_type_settings" label="環境設定" />
+				<combo_box.item value="filter_type_folders" label="檔案夾" />
 				<combo_box.item value="filter_type_coalesced" label="僅合併物件"/>
 				<combo_box.item value="filter_type_custom" label="自訂..." />
 			</combo_box>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 04bf4992f2..37f794a45e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -1011,7 +1011,7 @@
           Antialiasing Quality:
         </text>
         <combo_box
-         control_name="RenderFSAASamples"
+         control_name="RenderFSAAType"
          height="22"
          initial_value="false"
          follows="left|top"
diff --git a/indra/newview/skins/default/xui/fr/floater_fs_poser.xml b/indra/newview/skins/default/xui/fr/floater_fs_poser.xml
index 99a95e13eb..138f6683c1 100644
--- a/indra/newview/skins/default/xui/fr/floater_fs_poser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fs_poser.xml
@@ -268,7 +268,7 @@
 						<slider label="Point X :" name="Advanced_Position_X" />
 						<slider label="Point Y :" name="Advanced_Position_Y" />
 						<slider label="Point Z :" name="Advanced_Position_Z" />
-						<button label="Annuler reposition" name="undo_position_change" tool_tip="Annuler le dernier changement de position" />
+						<button label="Annuler pos." name="undo_position_change" tool_tip="Annuler le dernier changement de position" />
 						<button label="Repositionner" name="redo_position_change" tool_tip="Refaire le dernier changement de position" />
 						<button label="Réinit. position" name="reset_positions" tool_tip="Double-cliquez pour rétablir la position d'origine" />
 					</panel>
@@ -276,7 +276,7 @@
 						<slider label="Échelle X :" name="Advanced_Scale_X" />
 						<slider label="Échelle Y :" name="Advanced_Scale_Y" />
 						<slider label="Échelle Z :" name="Advanced_Scale_Z" />
-						<button label="Annuler le changement d'échelle" name="undo_scale_change" tool_tip="Annuler le dernier changement d'échelle" />
+						<button label="Annuler échelle" name="undo_scale_change" tool_tip="Annuler le dernier changement d'échelle" />
 						<button label="À l'échelle" name="redo_scale_change" tool_tip="Refaire le dernier changement d'échelle" />
 						<button label="Réinit. échelle" name="reset_scales" tool_tip="Double-cliquez pour rétablir l'échelle d'origine" />
 					</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 3e697cc35e..161ba064ac 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -25,6 +25,8 @@
 			<check_box label="Interface" name="ui_check"/>
 			<check_box label="Solde de L$" name="currency_check"/>
 			<check_box label="HUD" name="hud_check"/>
+			<check_box label="Afficher le cadre de la photo" tool_tip="Affiche un cadre à l'écran qui entoure la zones de la photo. Les parties de la scène qui se trouvent en dehors de la photo sont dé-saturées et légèrement floues." name="show_frame"/>
+			<check_box label="Afficher le guide de cadrage" tool_tip="Affiche le guide de cadrage (règle des tiers) à l'intérieur du cadre de la photo." name="show_guides"/>
 			<check_box label="Figer l'écran (plein écran)" name="freeze_frame_check"/>
 			<check_box label="Actualisation automatique" name="auto_snapshot_check"/>
 			<text name="filter_list_label">Filtre :</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_flickr_photo.xml b/indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
index cb6bbbf28e..5f035b3334 100644
--- a/indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
@@ -7,6 +7,8 @@
 	<combo_box name="filters_combobox" tool_tip="Filtres sur l'image"><combo_box.item label="Aucun filtre" name="NoFilter"/></combo_box>
 	<check_box label="Ratio conservé" name="keep_aspect_ratio"/>
 	<text name="working_lbl">Actualisation...</text>
+	<check_box label="Cadre de la photo" tool_tip="Affiche un cadre à l'écran qui entoure la zones de la photo. Les parties de la scène qui se trouvent en dehors de la photo sont dé-saturées et légèrement floues." name="show_frame"/>
+	<check_box label="Guide de cadrage" tool_tip="Affiche le guide de cadrage (règle des tiers) à l'intérieur du cadre de la photo." name="show_guides"/>
 	<button label="Actualiser" name="new_snapshot_btn" tool_tip="Cliquez pour actualiser"/>
 	<button label="Prévisualiser" name="big_preview_btn" tool_tip="Cliquez pour obtenir un aperçu"/>
 	<text name="title_label">Titre :</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
index 0433b0a167..9b4da2bca8 100644
--- a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
@@ -44,6 +44,7 @@
 				<combo_box.item value="filter_type_snapshots" label="Zdjęcia" />
 				<combo_box.item value="filter_type_materials" label="Materiały" />
 				<combo_box.item value="filter_type_settings" label="Otoczenia" />
+				<combo_box.item value="filter_type_folders" label="Foldery" />
 				<combo_box.item value="filter_type_coalesced" label="Tylko podniesione razem" />
 				<combo_box.item value="filter_type_custom" label="Własny filtr..." />
 			</combo_box>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 4b5676bcee..0489798959 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -1876,6 +1876,7 @@ Jeśli ciągle otrzymujesz tą wiadomość, to skontaktuj się z pomocą technic
 	<string name="Textures" value=" Tekstury,"/>
 	<string name="Settings" value=" Otoczenia," />
 	<string name="Snapshots" value=" Zdjęcia,"/>
+	<string name="Folders" value=" Foldery,"/>
 	<string name="No Filters" value="Nie "/>
 	<string name="Since Logoff" value=" - od wylogowania"/>
 	<string name="Modifiable" value="Modyfikowalne" />
diff --git a/indra/newview/skins/default/xui/ru/floater_snapshot.xml b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
index ec9303b6d5..9ccef35652 100644
--- a/indra/newview/skins/default/xui/ru/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
@@ -57,12 +57,16 @@
 		<combo_box label="Слои изображения" name="layer_types">
 			<combo_box.item label="Цвета" name="Colors"/>
 			<combo_box.item label="Глубина" name="Depth"/>
+			<combo_box.item label="Глубина (24 бит)" name="Depth24"/>
 		</combo_box>
 		<check_box label="Интерфейс" name="ui_check"/>
 		<check_box label="L$ Баланс" name="currency_check"/>
 		<check_box label="Данные в игре" name="hud_check"/>
+		<check_box label="Показать кадр захвата" tool_tip="Показать на экране рамку, окружающую области снимка. Части сцены, находящиеся за пределами снимка, будут обесцвечены и слегка размыты." name="show_frame" />
+		<check_box label="Показать кадрирование" tool_tip="Показать руководство по кадрированию (правило третей) внутри рамки снимка" name="show_guides" />
 		<check_box label="Стоп-кадр (полноэкранный)" name="freeze_frame_check"/>
 		<check_box label="Автообновление" name="auto_snapshot_check"/>
+		<check_box label="Без постобработки" name="no_post_check" />
 		<text name="filter_list_label" width="60">
             Фильтр:
         </text>
diff --git a/indra/newview/skins/default/xui/ru/panel_flickr_photo.xml b/indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
index 8ca6804796..92ef27e667 100644
--- a/indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
@@ -5,6 +5,7 @@
 		<combo_box.item label="640x480" name="640x480"/>
 		<combo_box.item label="800x600" name="800x600"/>
 		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="Произвольный" name="Custom"/>
 	</combo_box>
 	<combo_box name="filters_combobox" tool_tip="Фильтры изображений">
 		<combo_box.item label="Без фильтра" name="NoFilter"/>
@@ -13,6 +14,8 @@
 	<text name="working_lbl">
 		Обновление...
 	</text>
+	<check_box label="Показать кадр" tool_tip="Показать на экране рамку, окружающую области снимка. Части сцены, находящиеся за пределами снимка, будут обесцвечены и слегка размыты." name="show_frame" />
+	<check_box label="Кадрирование" tool_tip="Показать руководство по кадрированию (правило третей) внутри рамки снимка" name="show_guides" />
 	<button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкните для обновления"/>
 	<button label="Просмотр" name="big_preview_btn" tool_tip="Щелкните для смены вида"/>
 	<text name="title_label">
diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
index df14c5d5d0..61487ed202 100644
--- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
@@ -44,6 +44,7 @@
 				<combo_box.item value="filter_type_snapshots" label="Снимки" />
 				<combo_box.item value="filter_type_materials" label="Материалы" />
 				<combo_box.item value="filter_type_settings" label="Настройки" />
+				<combo_box.item value="filter_type_folders" label="Папки" />
 				<combo_box.item value="filter_type_coalesced" label="Только объединенные"/>
 				<combo_box.item value="filter_type_custom" label="Другое..." />
 			</combo_box>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index e155ad1cf2..7233dba5b9 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -1938,6 +1938,7 @@ https://www.firestormviewer.org/support за помощь в решении эт
 	<string name="Textures" value=" Текстуры,"/>
 	<string name="Settings" value=" Настройки,"/>
 	<string name="Snapshots" value=" Снимки,"/>
+	<string name="Folders" value=" Папки," />
 	<string name="No Filters" value="Нет "/>
 	<string name="Since Logoff" value=" - с выхода"/>
 	<string name="Modifiable" value="Изменяемое"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
index e18ff458d8..73ac6a0c2a 100644
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
@@ -42,9 +42,9 @@
 				<combo_box.item value="filter_type_sounds" label="聲音" />
 				<combo_box.item value="filter_type_textures" label="紋理" />
 				<combo_box.item value="filter_type_snapshots" label="快照" />
-				<combo_box.item value="filter_type_meshes" label="網格模型" />
 				<combo_box.item value="filter_type_materials" label="材質" />
 				<combo_box.item value="filter_type_settings" label="環境設定" />
+				<combo_box.item value="filter_type_folders" label="檔案夾" />
 				<combo_box.item value="filter_type_coalesced" label="僅合併物件"/>
 				<combo_box.item value="filter_type_custom" label="自訂..." />
 			</combo_box>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 2059ad8366..e6273dc073 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -2016,8 +2016,8 @@ support@secondlife.com.
 	<string name="PermNo">
 		否
 	</string>
-	<!-- 手勢標籤 -->
-	<!-- 因為前面有空格所以使用 value="" -->
+	<!-- inventory filter -->
+	<!-- use value="" because they have preceding spaces -->
 	<string name="Chat Message" value=" 聊天訊息 : " />
 	<string name="Sound" value=" 聲音 : " />
 	<string name="Wait" value=" --- 等待 : " />
@@ -2028,8 +2028,8 @@ support@secondlife.com.
 	<string name="HelloAvatar" value=" 你好, 居民! " />
 	<string name="ViewAllGestures" value="  檢視所有 &gt;&gt;" />
 	<string name="GetMoreGestures" value="  取得更多 &gt;&gt;" />
-	<!-- 物件欄過濾器 -->
-	<!-- 因為前面有空格所以使用 value="" -->
+	<!-- inventory filter -->
+	<!-- use value="" because they have preceding spaces -->
 	<string name="Animations" value=" 動畫," />
 	<string name="Calling Cards" value=" 名片," />
 	<string name="Clothing" value=" 服裝," />
@@ -2043,9 +2043,10 @@ support@secondlife.com.
 	<string name="Textures" value=" 紋理," />
 	<string name="Settings" value=" 環境設定," />
 	<string name="Snapshots" value=" 快照," />
+	<string name="Folders" value=" 檔案夾," />
 	<string name="No Filters" value="無過濾器 " />
 	<string name="Since Logoff" value=" - 自上次登出之後" />
-	<!-- <FS:Zi> FIRE-1175 - 過濾許可權菜單 -->
+	<!-- <FS:Zi> FIRE-1175 - Filter Permissions Menu -->
 	<string name="Modifiable" value="可修改" />
 	<string name="Copyable" value="可複製" />
 	<string name="Transferable" value="可轉讓" />
diff --git a/indra/newview/skins/starlight/xui/zh/panel_main_inventory.xml b/indra/newview/skins/starlight/xui/zh/panel_main_inventory.xml
index 5b4f9fb5d0..3429549796 100644
--- a/indra/newview/skins/starlight/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/starlight/xui/zh/panel_main_inventory.xml
@@ -42,8 +42,9 @@
 				<combo_box.item value="filter_type_sounds" label="聲音" />
 				<combo_box.item value="filter_type_textures" label="紋理" />
 				<combo_box.item value="filter_type_snapshots" label="快照" />
-				<combo_box.item value="filter_type_settings" label="環境設定" />
 				<combo_box.item value="filter_type_materials" label="材質" />
+				<combo_box.item value="filter_type_settings" label="環境設定" />
+				<combo_box.item value="filter_type_folders" label="檔案夾" />
 				<combo_box.item value="filter_type_coalesced" label="僅合併物件"/>
 				<combo_box.item value="filter_type_custom" label="自訂..." />
 			</combo_box>
diff --git a/indra/newview/skins/starlightcui/xui/zh/panel_main_inventory.xml b/indra/newview/skins/starlightcui/xui/zh/panel_main_inventory.xml
index 5b4f9fb5d0..3429549796 100644
--- a/indra/newview/skins/starlightcui/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/starlightcui/xui/zh/panel_main_inventory.xml
@@ -42,8 +42,9 @@
 				<combo_box.item value="filter_type_sounds" label="聲音" />
 				<combo_box.item value="filter_type_textures" label="紋理" />
 				<combo_box.item value="filter_type_snapshots" label="快照" />
-				<combo_box.item value="filter_type_settings" label="環境設定" />
 				<combo_box.item value="filter_type_materials" label="材質" />
+				<combo_box.item value="filter_type_settings" label="環境設定" />
+				<combo_box.item value="filter_type_folders" label="檔案夾" />
 				<combo_box.item value="filter_type_coalesced" label="僅合併物件"/>
 				<combo_box.item value="filter_type_custom" label="自訂..." />
 			</combo_box>
diff --git a/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml
index b145e0e235..67f71134d1 100644
--- a/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml
+++ b/indra/newview/skins/vintage/xui/pl/panel_main_inventory.xml
@@ -117,6 +117,7 @@
 		<combo_box.item value="filter_type_snapshots" label="Zdjęcia" />
 		<combo_box.item value="filter_type_materials" label="Materiały" />
 		<combo_box.item value="filter_type_settings" label="Otoczenia" />
+		<combo_box.item value="filter_type_folders" label="Foldery" />
 		<combo_box.item value="filter_type_coalesced" label="Tylko podniesione razem" />
 		<combo_box.item value="filter_type_custom" label="Własny filtr..." />
 	</combo_box>
diff --git a/indra/newview/skins/vintage/xui/zh/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/zh/panel_main_inventory.xml
index 9b53782dfa..5939b6811c 100644
--- a/indra/newview/skins/vintage/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/vintage/xui/zh/panel_main_inventory.xml
@@ -118,6 +118,7 @@
 		<combo_box.item value="filter_type_snapshots" label="快照" />
 		<combo_box.item value="filter_type_materials" label="材質" />
 		<combo_box.item value="filter_type_settings" label="環境設定" />
+		<combo_box.item value="filter_type_folders" label="檔案夾" />
 		<combo_box.item value="filter_type_coalesced" label="僅合併物件"/>
 		<combo_box.item value="filter_type_custom" label="自訂..." />
 	</combo_box>