diff --git a/indra/newview/app_settings/camera/Front.xml b/indra/newview/app_settings/camera/Front.xml
index f9f615c4a7..1bf35c8682 100644
--- a/indra/newview/app_settings/camera/Front.xml
+++ b/indra/newview/app_settings/camera/Front.xml
@@ -1,16 +1,5 @@
 <llsd>
     <map>
-    <key>AppearanceCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering appearance editing mode, camera zooms in on currently selected portion of avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>1</integer>
-        </map>
     <key>AvatarSitRotation</key>
     <map>
         <key>Comment</key>
@@ -90,17 +79,6 @@
         <key>Value</key>
             <real>0.90322577953338623</real>
         </map>
-    <key>EditCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering build mode, camera moves up above avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
     <key>FocusOffsetRearView</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/app_settings/camera/Rear.xml b/indra/newview/app_settings/camera/Rear.xml
index a084f83bfe..a4de53d698 100644
--- a/indra/newview/app_settings/camera/Rear.xml
+++ b/indra/newview/app_settings/camera/Rear.xml
@@ -1,16 +1,5 @@
 <llsd>
     <map>
-    <key>AppearanceCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering appearance editing mode, camera zooms in on currently selected portion of avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>1</integer>
-        </map>
     <key>AvatarSitRotation</key>
     <map>
         <key>Comment</key>
@@ -90,17 +79,6 @@
         <key>Value</key>
             <real>0.90322577953338623</real>
         </map>
-    <key>EditCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering build mode, camera moves up above avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
     <key>FocusOffsetRearView</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/app_settings/camera/Side.xml b/indra/newview/app_settings/camera/Side.xml
index 5db5b164bd..0ff6c5ae3f 100644
--- a/indra/newview/app_settings/camera/Side.xml
+++ b/indra/newview/app_settings/camera/Side.xml
@@ -1,16 +1,5 @@
 <llsd>
     <map>
-    <key>AppearanceCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering appearance editing mode, camera zooms in on currently selected portion of avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>1</integer>
-        </map>
     <key>AvatarSitRotation</key>
     <map>
         <key>Comment</key>
@@ -90,17 +79,6 @@
         <key>Value</key>
             <real>0.90322577953338623</real>
         </map>
-    <key>EditCameraMovement</key>
-        <map>
-        <key>Comment</key>
-            <string>When entering build mode, camera moves up above avatar</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
     <key>FocusOffsetRearView</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index f4d6ec4ae1..d99466ec28 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -275,8 +275,10 @@ void LLPresetsManager::getControlNames(std::vector<std::string>& names)
 		// From panel_preferences_move.xml
 		("CameraAngle")
 		("CameraOffsetScale")
-		("EditCameraMovement")
-		("AppearanceCameraMovement")
+		// <FS:Ansariel> FIRE-29930: Don't include these settings as it might be confusing why settings suddenly reset
+		//("EditCameraMovement")
+		//("AppearanceCameraMovement")
+		// </FS:Ansariel>
 		// From llagentcamera.cpp
 		("CameraOffsetBuild")
 		("TrackFocusObject")
@@ -286,9 +288,6 @@ void LLPresetsManager::getControlNames(std::vector<std::string>& names)
 		// <FS:Ansariel> Additional settings
 		("ZoomTime")
 		("CameraPositionSmoothing")
-		("EditAppearanceLighting")
-		("FSDisableMouseWheelCameraZoom")
-		("DisableCameraConstraints")
 		// </FS:Ansariel>
         ;
     names = camera_controls;
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 35e2ee028c..4136ad27e3 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -273,6 +273,7 @@
 		</menu>
 		<menu_item_check label="Zezwól na czat OOC (Out Of Character)" name="Allow OOC Chat"/>
 		<menu_item_check label="Pokaż filtrowany czat" name="Show Filtered Chat" />
+		<menu_item_check label="Pokaż, że ktoś pisze, gdy czat jest przekierowywany" name="Show Redirected Chat Typing" />
 		<menu_item_check label="Dziel długi przekierowany czat" name="Split Long Redirected Chat" />
 		<menu_item_check label="Zezwól na tymczasowe dodatki" name="Allow Temporary Attachments"/>
 		<menu_item_check label="Odmów innym osobom/obiektom dodawania rzeczy do mojego #RLV" name="Forbid Give to #RLV"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
index 97ec0eb03d..6d7c930e45 100644
--- a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
@@ -16,6 +16,7 @@
 	<panel name="header_panel">
 		<panel name="outfit_name_and_status">
 			<text name="status" value="Trwa edycja..."/>
+			<text name="curr_outfit_name" value="[Obecny strój]" />
 		</panel>
 	</panel>
 	<layout_stack name="im_panels">
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 2a70884839..0f7393670a 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -305,14 +305,14 @@
 			<menu_item_check label="Включить старые имена (Legacy Naming)" name="Enable Legacy Naming"/>
 			<menu_item_check label="Включить 'Делиться одеждой' (Shared Wear)" name="Enable Shared Wear"/>
 			<menu_item_check label="Переименование общих элементов при ношении" name="Rename Shared Items on Wear"/>
-			<menu_item_check label="Блокировка..." name="Locks"/>
+			<menu_item_check label="Блокировки..." name="Locks"/>
 		</menu>
-		<menu_item_check label="Разрешить OOC чат (Out Of Character)" name="Allow OOC Chat"/>
-		<menu_item_check label="Запретить получение в #RLV" name="Forbid Give to #RLV"/>
+		<menu_item_check label="Разрешить не ролевой чат (Вышел из Роли)" name="Allow OOC Chat"/>
 		<menu_item_check label="Показать фильтрованый чат" name="Show Filtered Chat"/>
+		<menu_item_check label="Показать 'Печатает' в Перенаправленном Чате" name="Show Redirected Chat Typing"/>
 		<menu_item_check label="Разделять длинный Перенаправленный Чат" name="Split Long Redirected Chat"/>
 		<menu_item_check label="Разрешить временное присоединение" name="Allow Temporary Attachments"/>
-		<menu_item_check label="Показывать имена" name="Show Name Tags"/>
+		<menu_item_check label="Запретить получение в папку #RLV" name="Forbid Give to #RLV"/>
 		<menu_item_check label="Замена одежды разблокирована" name="Wear Replaces Unlocked"/>
 		<menu_item_check label="Консоль..." name="Console"/>
 		<menu_item_check label="Ограничения..." name="Restrictions"/>