SL-12186 WIP Updating UI for camera controls, including presets

1 files changed, 5 insertions, 35 deletions

diff --git a/indra/newview/llfloaterpreferenceviewadvanced.cpp b/indra/newview/llfloaterpreferenceviewadvanced.cpp
index 791ff79d87..57484d0d0a 100644
--- a/indra/newview/llfloaterpreferenceviewadvanced.cpp
+++ b/indra/newview/llfloaterpreferenceviewadvanced.cpp
@@ -25,6 +25,7 @@
  */
 
 #include "llviewerprecompiledheaders.h"
+#include "llagentcamera.h"
 #include "llfloaterpreferenceviewadvanced.h"
 #include "llfloater.h"
 #include "llfloaterreg.h"
@@ -36,40 +37,12 @@
 LLFloaterPreferenceViewAdvanced::LLFloaterPreferenceViewAdvanced(const LLSD& key) 
 :	LLFloater(key)
 {
-	mCommitCallbackRegistrar.add("Cancel",	boost::bind(&LLFloaterPreferenceViewAdvanced::onClickCancel, this));
 	mCommitCallbackRegistrar.add("CommitSettings",	boost::bind(&LLFloaterPreferenceViewAdvanced::onCommitSettings, this));
-	mCommitCallbackRegistrar.add("Ok",	boost::bind(&LLFloaterPreferenceViewAdvanced::onClickOk, this));
-
 }
 
 LLFloaterPreferenceViewAdvanced::~LLFloaterPreferenceViewAdvanced()
 {}
 
-void LLFloaterPreferenceViewAdvanced::onClickOk()
-{
-	closeFloater();
-}
-
-void LLFloaterPreferenceViewAdvanced::onClickCancel()
-{
-	gSavedSettings.setVector3("CameraOffsetRearView", mCameraSaved);
-	gSavedSettings.setVector3d("FocusOffsetRearView", mFocusSaved);
-
-	updateCameraControl(mCameraSaved);
-	updateFocusControl(mFocusSaved);
-}
-
-BOOL LLFloaterPreferenceViewAdvanced::postBuild()
-{
-	mCameraSaved = gSavedSettings.getVector3("CameraOffsetRearView");
-	mFocusSaved = gSavedSettings.getVector3d("FocusOffsetRearView");
-
-	updateCameraControl(mCameraSaved);
-	updateFocusControl(mFocusSaved);
-
-	return TRUE;
-}
-
 void LLFloaterPreferenceViewAdvanced::updateCameraControl(const LLVector3& vector)
 {
 	getChild<LLSpinCtrl>("camera_x")->setValue(vector[VX]);
@@ -86,11 +59,8 @@ void LLFloaterPreferenceViewAdvanced::updateFocusControl(const LLVector3d& vecto
 
  void LLFloaterPreferenceViewAdvanced::draw()
 {
-	static LLCachedControl<LLVector3> camera(gSavedSettings, "CameraOffsetRearView");
-	static LLCachedControl<LLVector3d> focus(gSavedSettings, "FocusOffsetRearView");
-
-	updateCameraControl(camera);
-	updateFocusControl(focus);
+	updateCameraControl(gAgentCamera.getCameraOffsetInitial());
+	updateFocusControl(gAgentCamera.getFocusOffsetInitial());
 
 	LLFloater::draw();
 }
@@ -103,10 +73,10 @@ void LLFloaterPreferenceViewAdvanced::onCommitSettings()
 	vector.mV[VX] = (F32)getChild<LLUICtrl>("camera_x")->getValue().asReal();
 	vector.mV[VY] = (F32)getChild<LLUICtrl>("camera_y")->getValue().asReal();
 	vector.mV[VZ] = (F32)getChild<LLUICtrl>("camera_z")->getValue().asReal();
-	gSavedSettings.setVector3("CameraOffsetRearView", vector);
+	gSavedSettings.setVector3(gAgentCamera.getCameraOffsetCtrlName(), vector);
 
 	vector3d.mdV[VX] = (F32)getChild<LLUICtrl>("focus_x")->getValue().asReal();
 	vector3d.mdV[VY] = (F32)getChild<LLUICtrl>("focus_y")->getValue().asReal();
 	vector3d.mdV[VZ] = (F32)getChild<LLUICtrl>("focus_z")->getValue().asReal();
-	gSavedSettings.setVector3d("FocusOffsetRearView", vector3d);
+	gSavedSettings.setVector3d(gAgentCamera.getFocusOffsetCtrlName(), vector3d);
 }