diff --git a/indra/llwindow/llwindowsdl2.cpp b/indra/llwindow/llwindowsdl2.cpp
index 7c877c8ba7..8128d33619 100644
--- a/indra/llwindow/llwindowsdl2.cpp
+++ b/indra/llwindow/llwindowsdl2.cpp
@@ -2691,7 +2691,8 @@ U32 LLWindowSDL::getAvailableVRAMMegabytes()
     return gGLManager.mVRAM - (LLImageGL::getTextureBytesAllocated() * total_factor/mb);
 */
     LL_PROFILE_ZONE_SCOPED;
-    if (gGLManager.mHasNVXMemInfo)
+    // Only use the accurate feedback if we are not using an override
+    if (gGLManager.mHasNVXMemInfo && gGLManager.mVRAM == gGLManager.mVRAMDetected)
     {
         S32 available_memory;
         glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX, &available_memory);
diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
index b87d0619f8..3e4c995885 100644
--- a/indra/newview/skins/default/xui/fr/floater_camera.xml
+++ b/indra/newview/skins/default/xui/fr/floater_camera.xml
@@ -17,6 +17,8 @@
 		<layout_stack name="camera_view_layout_stack">
 			<layout_panel name="camera_rotate_layout_panel">
 				<joystick_rotate name="cam_rotate_stick" tool_tip="Faire tourner la caméra autour du point central"/>
+				<button name="roll_left" tool_tip="Faire pivoter la caméra vers la gauche"/>
+				<button name="roll_right" tool_tip="Faire pivoter la caméra vers la droite"/>
 			</layout_panel>
 			<layout_panel name="camera_zoom_layout_panel">
 				<slider_bar name="zoom_slider" tool_tip="Zoomer en direction du point central"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_fs_camera_small.xml b/indra/newview/skins/default/xui/fr/floater_fs_camera_small.xml
index 7cc629b60a..966253014f 100644
--- a/indra/newview/skins/default/xui/fr/floater_fs_camera_small.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fs_camera_small.xml
@@ -13,6 +13,8 @@
 		<layout_stack name="camera_view_layout_stack">
 			<layout_panel name="camera_rotate_layout_panel">
 				<joystick_rotate name="cam_rotate_stick" tool_tip="Faites pivoter la caméra autour du sujet" />
+				<button name="roll_left" tool_tip="Faire pivoter la caméra vers la gauche"/>
+				<button name="roll_right" tool_tip="Faire pivoter la caméra vers la droite"/>
 			</layout_panel>
 			<layout_panel name="camera_zoom_layout_panel">
 				<slider_bar name="zoom_slider" tool_tip="Zoomez sur le sujet" />
diff --git a/indra/newview/skins/default/xui/ru/floater_camera.xml b/indra/newview/skins/default/xui/ru/floater_camera.xml
index 8d78746033..2446faeadc 100644
--- a/indra/newview/skins/default/xui/ru/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ru/floater_camera.xml
@@ -25,6 +25,8 @@
 		<layout_stack name="camera_view_layout_stack">
 			<layout_panel name="camera_rotate_layout_panel">
 				<joystick_rotate name="cam_rotate_stick" tool_tip="Вращение камеры вокруг точки фокусировки"/>
+				<button name="roll_left" tool_tip="Вращать камеру влево"/>
+				<button name="roll_right" tool_tip="Вращать камеру вправо"/>
 			</layout_panel>
 			<layout_panel name="camera_zoom_layout_panel">
 				<slider_bar name="zoom_slider" tool_tip="Приблизить/отдалить камеру к/от точки фокусировки"/>
@@ -42,4 +44,4 @@
 		</combo_box>
 		<button name="gear_btn" tool_tip="Предустановки Камеры"/>
 	</panel>
-</floater>
\ No newline at end of file
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_fs_camera_small.xml b/indra/newview/skins/default/xui/ru/floater_fs_camera_small.xml
index 1f418f5f40..22da0203b7 100644
--- a/indra/newview/skins/default/xui/ru/floater_fs_camera_small.xml
+++ b/indra/newview/skins/default/xui/ru/floater_fs_camera_small.xml
@@ -13,6 +13,8 @@
         <layout_stack name="camera_view_layout_stack">
             <layout_panel name="camera_rotate_layout_panel">
                 <joystick_rotate name="cam_rotate_stick" tool_tip="Вращение камеры вокруг точки фокусировки"/>
+                <button name="roll_left" tool_tip="Вращать камеру влево"/>
+                <button name="roll_right" tool_tip="Вращать камеру вправо"/>
             </layout_panel>
             <layout_panel name="camera_zoom_layout_panel">
                 <slider_bar name="zoom_slider" tool_tip="Приблизить/отдалить камеру к/от точки фокусировки"/>