diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 777963bec5f331ff9801765e86b0d7749b6b2235..5bebebf21f31839583e5f485b2770dd03184aae7 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -387,7 +387,7 @@ void LLFloaterCamera::onViewButtonClick(const LLSD& user_data)
// grab the 'view' panel from the preferences floater and
// bring it the front!
LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
- LLPanel* graphicspanel = prefsfloater->getChild<LLPanel>("move");
+ LLPanel* graphicspanel = prefsfloater->getChild<LLPanel>("view");
if (tabcontainer && graphicspanel)
{
tabcontainer->selectTabPanel(graphicspanel);
diff --git a/indra/newview/llpanelpresetscamerapulldown.cpp b/indra/newview/llpanelpresetscamerapulldown.cpp
index e2b9c080fb8de6ebfbe74ce0d353aff543a36b5e..7612c428d958d00f2c07e685b5418a2b43b5977d 100644
--- a/indra/newview/llpanelpresetscamerapulldown.cpp
+++ b/indra/newview/llpanelpresetscamerapulldown.cpp
@@ -212,7 +212,7 @@ void LLPanelPresetsCameraPulldown::onViewButtonClick(const LLSD& user_data)
// grab the 'view' panel from the preferences floater and
// bring it the front!
LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
- LLPanel* graphicspanel = prefsfloater->getChild<LLPanel>("move");
+ LLPanel* graphicspanel = prefsfloater->getChild<LLPanel>("view");
if (tabcontainer && graphicspanel)
{
tabcontainer->selectTabPanel(graphicspanel);
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 7fcc91ffe9019e3367721b47dad522c8fb48bb71..545816c78a1fe5c07ceb74aaa78197780998bcee 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -87,10 +87,17 @@ https://accounts.secondlife.com/change_email/
<panel
class="panel_preference_view"
filename="panel_preferences_move.xml"
- label="Move & View"
+ label="Move"
layout="topleft"
help_topic="preferences_move_tab"
name="move" />
+ <panel
+ class="panel_preference_view"
+ filename="panel_preferences_view.xml"
+ label="View"
+ layout="topleft"
+ help_topic="preferences_view_tab"
+ name="view" />
<panel
class="panel_preference"
filename="panel_preferences_alerts.xml"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 8d8441695f5d304fb88ae53792ad1ab1434581db..79fbf661398da0319550a91ae3d3f30d58df076a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -10,188 +10,6 @@
top="1"
width="517">
- <icon
- follows="left|top"
- height="18"
- image_name="Cam_FreeCam_Off"
- layout="topleft"
- name="camera_icon"
- mouse_opaque="false"
- visible="true"
- width="18"
- left="30"
- top="4"/>
-
- <text
- follows="top|left|right"
- height="16"
- layout="topleft"
- left="80"
- top_delta="0"
- width="100">
- Preset in use:
- </text>
-
- <text
- follows="top|left|right"
- height="16"
- layout="topleft"
- left_delta="100"
- name="preset_camera_text"
- width="120">
- (None)
- </text>
-
- <slider
- can_edit_text="true"
- control_name="CameraAngle"
- decimal_digits="2"
- follows="left|top"
- height="16"
- top_pad="5"
- increment="0.025"
- initial_value="1.57"
- layout="topleft"
- label_width="100"
- label="View angle"
- left="80"
- max_val="2.97"
- min_val="0.17"
- name="camera_fov"
- show_text="false"
- width="240" />
- <slider
- can_edit_text="true"
- control_name="CameraOffsetScale"
- decimal_digits="2"
- follows="left|top"
- height="16"
- increment="0.025"
- initial_value="1"
- layout="topleft"
- label="Distance"
- left_delta="0"
- label_width="100"
- max_val="3"
- min_val="0.5"
- name="camera_offset_scale"
- show_text="false"
- width="240"
- top_pad="5"/>
- <text
- follows="left|top"
- type="string"
- length="1"
- height="10"
- left="80"
- name="heading2"
- width="200"
- top_pad="5">
- Automatic position for:
- </text>
-
- <spinner
- control_name="CameraOpacity"
- decimal_digits="1"
- follows="top|left|right"
- height="24"
- max_val="1.0"
- min_val="0.0"
- increment="0.1"
- initial_value="1.0"
- label="Camera controls opacity:"
- label_width="180"
- layout="topleft"
- top_pad="-10"
- left_pad="10"
- width="220" />
-
- <check_box
- control_name="EditCameraMovement"
- height="20"
- follows="left|top"
- label="Build/Edit"
- layout="topleft"
- left="100"
- name="edit_camera_movement"
- tool_tip="Use automatic camera positioning when entering and exiting edit mode"
- width="280"
- top_pad="-10" />
- <check_box
- control_name="AppearanceCameraMovement"
- follows="left|top"
- height="16"
- label="Appearance"
- layout="topleft"
- name="appearance_camera_movement"
- tool_tip="Use automatic camera positioning while in edit mode"
- width="242" />
-
- <button
- follows="top|left"
- height="23"
- label="Advanced..."
- layout="topleft"
- left_pad="-102"
- name="PreferencesMoveAdvanced"
- tool_tip="Adjust camera positioning"
- width="115">
- <button.commit_callback
- function="Floater.Show"
- parameter="prefs_view_advanced" />
- </button>
-
- <button
- follows="top|left"
- height="23"
- label="Save settings as a preset..."
- layout="topleft"
- left="30"
- name="PrefCameraSaveButton"
- top_pad="10"
- width="200">
- <button.commit_callback
- function="Pref.PrefSave"
- parameter="camera" />
- </button>
-
- <button
- follows="top|left"
- height="23"
- label="Load preset..."
- layout="topleft"
- left_pad="10"
- name="PrefCameraLoadButton"
- top_delta="0"
- width="115">
- <button.commit_callback
- function="Pref.PrefLoad"
- parameter="camera"/>
- </button>
-
- <button
- follows="top|left"
- height="23"
- label="Delete preset..."
- layout="topleft"
- left_pad="10"
- name="PrefCameraDeleteButton"
- top_delta="0"
- width="115">
- <button.commit_callback
- function="Pref.PrefDelete"
- parameter="camera"/>
- </button>
-
- <view_border
- bevel_style="in"
- follows="left|top|right"
- height="0"
- layout="topleft"
- left="10"
- top_pad="5"
- width="500"/>
-
<icon
follows="left|top"
height="18"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_view.xml b/indra/newview/skins/default/xui/en/panel_preferences_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a7a69eb82965073f57edeafc426c76ab0ac5c1ba
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_view.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="left|top|right|bottom"
+ height="418"
+ label="View"
+ layout="topleft"
+ left="102"
+ name="view_panel"
+ top="1"
+ width="517">
+
+ <icon
+ follows="left|top"
+ height="18"
+ image_name="Cam_FreeCam_Off"
+ layout="topleft"
+ name="camera_icon"
+ mouse_opaque="false"
+ visible="true"
+ width="18"
+ left="30"
+ top="4"/>
+
+ <text
+ follows="top|left|right"
+ height="16"
+ layout="topleft"
+ left="80"
+ top_delta="0"
+ width="100">
+ Preset in use:
+ </text>
+
+ <text
+ follows="top|left|right"
+ height="16"
+ layout="topleft"
+ left_delta="100"
+ name="preset_camera_text"
+ width="120">
+ (None)
+ </text>
+
+ <slider
+ can_edit_text="true"
+ control_name="CameraAngle"
+ decimal_digits="2"
+ follows="left|top"
+ height="16"
+ top_pad="5"
+ increment="0.025"
+ initial_value="1.57"
+ layout="topleft"
+ label_width="100"
+ label="View angle"
+ left="80"
+ max_val="2.97"
+ min_val="0.17"
+ name="camera_fov"
+ show_text="false"
+ width="240" />
+ <slider
+ can_edit_text="true"
+ control_name="CameraOffsetScale"
+ decimal_digits="2"
+ follows="left|top"
+ height="16"
+ increment="0.025"
+ initial_value="1"
+ layout="topleft"
+ label="Distance"
+ left_delta="0"
+ label_width="100"
+ max_val="3"
+ min_val="0.5"
+ name="camera_offset_scale"
+ show_text="false"
+ width="240"
+ top_pad="5"/>
+ <text
+ follows="left|top"
+ type="string"
+ length="1"
+ height="10"
+ left="80"
+ name="heading2"
+ width="200"
+ top_pad="5">
+ Automatic position for:
+ </text>
+
+ <spinner
+ control_name="CameraOpacity"
+ decimal_digits="1"
+ follows="top|left|right"
+ height="24"
+ max_val="1.0"
+ min_val="0.0"
+ increment="0.1"
+ initial_value="1.0"
+ label="Camera controls opacity:"
+ label_width="180"
+ layout="topleft"
+ top_pad="-10"
+ left_pad="10"
+ width="220" />
+
+ <check_box
+ control_name="EditCameraMovement"
+ height="20"
+ follows="left|top"
+ label="Build/Edit"
+ layout="topleft"
+ left="100"
+ name="edit_camera_movement"
+ tool_tip="Use automatic camera positioning when entering and exiting edit mode"
+ width="280"
+ top_pad="-10" />
+ <check_box
+ control_name="AppearanceCameraMovement"
+ follows="left|top"
+ height="16"
+ label="Appearance"
+ layout="topleft"
+ name="appearance_camera_movement"
+ tool_tip="Use automatic camera positioning while in edit mode"
+ width="242" />
+
+ <button
+ follows="top|left"
+ height="23"
+ label="Advanced..."
+ layout="topleft"
+ left_pad="-102"
+ name="PreferencesViewAdvanced"
+ tool_tip="Adjust camera positioning"
+ width="115">
+ <button.commit_callback
+ function="Floater.Show"
+ parameter="prefs_view_advanced" />
+ </button>
+
+ <button
+ follows="top|left"
+ height="23"
+ label="Save settings as a preset..."
+ layout="topleft"
+ left="30"
+ name="PrefCameraSaveButton"
+ top_pad="10"
+ width="200">
+ <button.commit_callback
+ function="Pref.PrefSave"
+ parameter="camera" />
+ </button>
+
+ <button
+ follows="top|left"
+ height="23"
+ label="Load preset..."
+ layout="topleft"
+ left_pad="10"
+ name="PrefCameraLoadButton"
+ top_delta="0"
+ width="115">
+ <button.commit_callback
+ function="Pref.PrefLoad"
+ parameter="camera"/>
+ </button>
+
+ <button
+ follows="top|left"
+ height="23"
+ label="Delete preset..."
+ layout="topleft"
+ left_pad="10"
+ name="PrefCameraDeleteButton"
+ top_delta="0"
+ width="115">
+ <button.commit_callback
+ function="Pref.PrefDelete"
+ parameter="camera"/>
+ </button>
+</panel>