merge latest change from Jonathan

1 files changed, 6 insertions, 1 deletions

diff --git a/indra/newview/llfloaterpreferenceviewadvanced.cpp b/indra/newview/llfloaterpreferenceviewadvanced.cpp
index ff80328acc..055c6f2232 100644
--- a/indra/newview/llfloaterpreferenceviewadvanced.cpp
+++ b/indra/newview/llfloaterpreferenceviewadvanced.cpp
@@ -130,7 +130,12 @@ void LLFloaterPreferenceViewAdvanced::updateFocusControl(LLVector3d vector3d)
 
  void LLFloaterPreferenceViewAdvanced::draw()
 {
-//	updateControl();
+	static LLCachedControl<LLVector3> camera(gSavedSettings, "CameraOffsetRearView");
+	static LLCachedControl<LLVector3d> focus(gSavedSettings, "FocusOffsetRearView");
+
+	updateCameraControl(camera);
+	updateFocusControl(focus);
+
 	LLFloater::draw();
 }