summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreferenceviewadvanced.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterpreferenceviewadvanced.cpp')
-rw-r--r--indra/newview/llfloaterpreferenceviewadvanced.cpp74
1 files changed, 37 insertions, 37 deletions
diff --git a/indra/newview/llfloaterpreferenceviewadvanced.cpp b/indra/newview/llfloaterpreferenceviewadvanced.cpp
index e740a3a9cf..791ff79d87 100644
--- a/indra/newview/llfloaterpreferenceviewadvanced.cpp
+++ b/indra/newview/llfloaterpreferenceviewadvanced.cpp
@@ -34,11 +34,11 @@
LLFloaterPreferenceViewAdvanced::LLFloaterPreferenceViewAdvanced(const LLSD& key)
-: LLFloater(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));
+ mCommitCallbackRegistrar.add("Cancel", boost::bind(&LLFloaterPreferenceViewAdvanced::onClickCancel, this));
+ mCommitCallbackRegistrar.add("CommitSettings", boost::bind(&LLFloaterPreferenceViewAdvanced::onCommitSettings, this));
+ mCommitCallbackRegistrar.add("Ok", boost::bind(&LLFloaterPreferenceViewAdvanced::onClickOk, this));
}
@@ -47,66 +47,66 @@ LLFloaterPreferenceViewAdvanced::~LLFloaterPreferenceViewAdvanced()
void LLFloaterPreferenceViewAdvanced::onClickOk()
{
- closeFloater();
+ closeFloater();
}
void LLFloaterPreferenceViewAdvanced::onClickCancel()
{
- gSavedSettings.setVector3("CameraOffsetRearView", mCameraSaved);
- gSavedSettings.setVector3d("FocusOffsetRearView", mFocusSaved);
+ gSavedSettings.setVector3("CameraOffsetRearView", mCameraSaved);
+ gSavedSettings.setVector3d("FocusOffsetRearView", mFocusSaved);
- updateCameraControl(mCameraSaved);
- updateFocusControl(mFocusSaved);
+ updateCameraControl(mCameraSaved);
+ updateFocusControl(mFocusSaved);
}
BOOL LLFloaterPreferenceViewAdvanced::postBuild()
{
- mCameraSaved = gSavedSettings.getVector3("CameraOffsetRearView");
- mFocusSaved = gSavedSettings.getVector3d("FocusOffsetRearView");
+ mCameraSaved = gSavedSettings.getVector3("CameraOffsetRearView");
+ mFocusSaved = gSavedSettings.getVector3d("FocusOffsetRearView");
- updateCameraControl(mCameraSaved);
- updateFocusControl(mFocusSaved);
+ updateCameraControl(mCameraSaved);
+ updateFocusControl(mFocusSaved);
- return TRUE;
+ return TRUE;
}
void LLFloaterPreferenceViewAdvanced::updateCameraControl(const LLVector3& vector)
{
- getChild<LLSpinCtrl>("camera_x")->setValue(vector[VX]);
- getChild<LLSpinCtrl>("camera_y")->setValue(vector[VY]);
- getChild<LLSpinCtrl>("camera_z")->setValue(vector[VZ]);
+ getChild<LLSpinCtrl>("camera_x")->setValue(vector[VX]);
+ getChild<LLSpinCtrl>("camera_y")->setValue(vector[VY]);
+ getChild<LLSpinCtrl>("camera_z")->setValue(vector[VZ]);
}
void LLFloaterPreferenceViewAdvanced::updateFocusControl(const LLVector3d& vector3d)
{
- getChild<LLSpinCtrl>("focus_x")->setValue(vector3d[VX]);
- getChild<LLSpinCtrl>("focus_y")->setValue(vector3d[VY]);
- getChild<LLSpinCtrl>("focus_z")->setValue(vector3d[VZ]);
+ getChild<LLSpinCtrl>("focus_x")->setValue(vector3d[VX]);
+ getChild<LLSpinCtrl>("focus_y")->setValue(vector3d[VY]);
+ getChild<LLSpinCtrl>("focus_z")->setValue(vector3d[VZ]);
}
void LLFloaterPreferenceViewAdvanced::draw()
{
- static LLCachedControl<LLVector3> camera(gSavedSettings, "CameraOffsetRearView");
- static LLCachedControl<LLVector3d> focus(gSavedSettings, "FocusOffsetRearView");
+ static LLCachedControl<LLVector3> camera(gSavedSettings, "CameraOffsetRearView");
+ static LLCachedControl<LLVector3d> focus(gSavedSettings, "FocusOffsetRearView");
- updateCameraControl(camera);
- updateFocusControl(focus);
+ updateCameraControl(camera);
+ updateFocusControl(focus);
- LLFloater::draw();
+ LLFloater::draw();
}
void LLFloaterPreferenceViewAdvanced::onCommitSettings()
{
- LLVector3 vector;
- LLVector3d vector3d;
-
- 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);
-
- 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);
+ LLVector3 vector;
+ LLVector3d vector3d;
+
+ 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);
+
+ 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);
}