Fixed options missing from Text Chat and Input & Camera preferences (see VWR-13120)

3 files changed, 33 insertions, 10 deletions

diff --git a/linden/indra/newview/llpanelinput.cpp b/linden/indra/newview/llpanelinput.cpp
index 4b94435..d530d67 100644
--- a/linden/indra/newview/llpanelinput.cpp
+++ b/linden/indra/newview/llpanelinput.cpp
@@ -64,6 +64,8 @@ BOOL LLPanelInput::postBuild()
         childSetValue("invert_mouse", gSavedSettings.getBOOL("InvertMouse"));
         childSetValue("edit_camera_movement", gSavedSettings.getBOOL("EditCameraMovement"));
         childSetValue("appearance_camera_movement", gSavedSettings.getBOOL("AppearanceCameraMovement"));
+        childSetValue("zoom_time", gSavedSettings.getF32("ZoomTime"));
+        childSetValue("camera_position_smoothing", gSavedSettings.getF32("CameraPositionSmoothing"));
         childSetValue("first_person_avatar_visible", gSavedSettings.getBOOL("FirstPersonAvatarVisible"));
 
         LLSliderCtrl* fov_slider = getChild<LLSliderCtrl>("camera_fov");
@@ -95,6 +97,8 @@ void LLPanelInput::apply()
         gSavedSettings.setBOOL("EditCameraMovement", childGetValue("edit_camera_movement"));
         gSavedSettings.setBOOL("AppearanceCameraMovement", childGetValue("appearance_camera_movement"));
         gSavedSettings.setF32("CameraAngle", mPreAdjustFOV);
+        gSavedSettings.setF32("ZoomTime", childGetValue("zoom_time").asReal());
+        gSavedSettings.setF32("CameraPositionSmoothing", childGetValue("camera_position_smoothing").asReal());
         gSavedSettings.setBOOL("FirstPersonAvatarVisible", childGetValue("first_person_avatar_visible"));
 
         gSavedSettings.setString("DoubleClickAction", childGetValue("double_click_action"));
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index e9ab27c..547b547 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -32,7 +32,7 @@
         </text>
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
-             enabled="true" follows="left|top" height="47" label="You" left="148"
+             enabled="true" follows="left|top" height="56" label="You" left="148"
              mouse_opaque="true" name="user" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
@@ -55,7 +55,7 @@
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              control_name="ObjectChatColor" enabled="true" follows="left|top"
-             height="47"  label="Objects" left="148" mouse_opaque="true"
+             height="56" label="Objects" left="148" mouse_opaque="true"
              name="objects" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
@@ -77,7 +77,7 @@
              enabled="true" follows="left|top" height="56"
              label="URLs" left_delta="68" mouse_opaque="true" name="links" width="54" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-28" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box3" v_pad="0" width="135">
                 Chat Console:
@@ -116,7 +116,7 @@
              mouse_opaque="true" name="chat_full_width_check" radio_style="false"
              width="239" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-              bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+              bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box6" v_pad="0" width="135">
                 Chat Options:
@@ -134,20 +134,18 @@
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" enabled="true"
-  <check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" enabled="true"
+        <check_box bottom_delta="-18" control_name="ScriptErrorsAsChat" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show script errors and warnings as regular chat" left="148"
              mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
              width="275" />
-        <check_box bottom_delta="-20" enabled="true"
         <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play typing animation when chatting" left="148" mouse_opaque="true"
              name="play_typing_animation" radio_style="false" width="237" />
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+        <check_box bottom_delta="-18" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false" 
-       label="Show custom chat channel" left="148" mouse_opaque="true"
+             label="Show custom chat channel" left="148" mouse_opaque="true"
              name="toggle_channel_control" radio_style="false" width="237" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 79f775b..fa4f3a5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -47,7 +47,7 @@
              increment=".025" initial_val="1.57" left="276" max_val="2.97" min_val=".17"
              mouse_opaque="true" name="camera_fov" show_text="false" value="60" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
              mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
                 Camera Follow Distance:
@@ -57,6 +57,27 @@
              increment=".025" initial_val="1" left="276" min_val=".5" max_val="3"
              mouse_opaque="true" name="camera_offset_scale" show_text="false" value="1"
              width="128" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+       mouse_opaque="true" name="Camera Transition Time:" v_pad="0" width="128">
+    Camera Transition Time:
+  </text>
+  <slider bottom_delta="-6" can_edit_text="true" decimal_digits="1"
+       enabled="true" follows="left|top" height="16" increment="0.1"
+       initial_val="0.4" left="276" max_val="4" min_val="0" mouse_opaque="true"
+       name="zoom_time" show_text="false" value="2" width="128" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             mouse_opaque="true" name="Camera Smoothing:" v_pad="0" width="128">
+    Camera Smoothing:
+  </text>
+  <slider bottom_delta="-6" can_edit_text="true"
+             decimal_digits="1" enabled="true" follows="left|top" height="16"
+             increment="0.1" initial_val="1" left="276" max_val="9" min_val="0"
+             mouse_opaque="true" name="camera_position_smoothing" show_text="false" value="2"
+             width="128" />
         <check_box bottom_delta="-24" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Automatic Edit Camera Movement" left="148" mouse_opaque="true"