aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelinput.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-01-08 19:53:37 -0700
committerMcCabe Maxsted2010-01-08 20:20:35 -0700
commit543fbb612317e9687e2eaeb48c3346e891fc0508 (patch)
treebf5b4f828831dd8bd2b2e411628111e16ec67b28 /linden/indra/newview/llpanelinput.cpp
parentApplied SNOW-378: debug setting to compile inventory scripts in Mono (diff)
downloadmeta-impy-543fbb612317e9687e2eaeb48c3346e891fc0508.zip
meta-impy-543fbb612317e9687e2eaeb48c3346e891fc0508.tar.gz
meta-impy-543fbb612317e9687e2eaeb48c3346e891fc0508.tar.bz2
meta-impy-543fbb612317e9687e2eaeb48c3346e891fc0508.tar.xz
Fixed options missing from Text Chat and Input & Camera preferences (see VWR-13120)
Diffstat (limited to 'linden/indra/newview/llpanelinput.cpp')
-rw-r--r--linden/indra/newview/llpanelinput.cpp4
1 files changed, 4 insertions, 0 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()
64 childSetValue("invert_mouse", gSavedSettings.getBOOL("InvertMouse")); 64 childSetValue("invert_mouse", gSavedSettings.getBOOL("InvertMouse"));
65 childSetValue("edit_camera_movement", gSavedSettings.getBOOL("EditCameraMovement")); 65 childSetValue("edit_camera_movement", gSavedSettings.getBOOL("EditCameraMovement"));
66 childSetValue("appearance_camera_movement", gSavedSettings.getBOOL("AppearanceCameraMovement")); 66 childSetValue("appearance_camera_movement", gSavedSettings.getBOOL("AppearanceCameraMovement"));
67 childSetValue("zoom_time", gSavedSettings.getF32("ZoomTime"));
68 childSetValue("camera_position_smoothing", gSavedSettings.getF32("CameraPositionSmoothing"));
67 childSetValue("first_person_avatar_visible", gSavedSettings.getBOOL("FirstPersonAvatarVisible")); 69 childSetValue("first_person_avatar_visible", gSavedSettings.getBOOL("FirstPersonAvatarVisible"));
68 70
69 LLSliderCtrl* fov_slider = getChild<LLSliderCtrl>("camera_fov"); 71 LLSliderCtrl* fov_slider = getChild<LLSliderCtrl>("camera_fov");
@@ -95,6 +97,8 @@ void LLPanelInput::apply()
95 gSavedSettings.setBOOL("EditCameraMovement", childGetValue("edit_camera_movement")); 97 gSavedSettings.setBOOL("EditCameraMovement", childGetValue("edit_camera_movement"));
96 gSavedSettings.setBOOL("AppearanceCameraMovement", childGetValue("appearance_camera_movement")); 98 gSavedSettings.setBOOL("AppearanceCameraMovement", childGetValue("appearance_camera_movement"));
97 gSavedSettings.setF32("CameraAngle", mPreAdjustFOV); 99 gSavedSettings.setF32("CameraAngle", mPreAdjustFOV);
100 gSavedSettings.setF32("ZoomTime", childGetValue("zoom_time").asReal());
101 gSavedSettings.setF32("CameraPositionSmoothing", childGetValue("camera_position_smoothing").asReal());
98 gSavedSettings.setBOOL("FirstPersonAvatarVisible", childGetValue("first_person_avatar_visible")); 102 gSavedSettings.setBOOL("FirstPersonAvatarVisible", childGetValue("first_person_avatar_visible"));
99 103
100 gSavedSettings.setString("DoubleClickAction", childGetValue("double_click_action")); 104 gSavedSettings.setString("DoubleClickAction", childGetValue("double_click_action"));