Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish adding AutoPilot to preferences (my bad!)

Browse Source
This commit is contained in:
Lirusaito
2015-11-16 23:36:26 -05:00
parent a9eb118897
commit 16daa6850e
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/ascentprefssys.cpp
View File

@@ -144,6 +144,7 @@ void LLPrefsAscentSys::refreshValues()
{
//General -----------------------------------------------------------------------------
mDoubleClickTeleport = gSavedSettings.getBOOL("DoubleClickTeleport");
mDoubleClickAutoPilot = gSavedSettings.getBOOL("DoubleClickAutoPilot");
mResetCameraAfterTP = gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
mOffsetTPByUserHeight = gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
mClearBeaconAfterTeleport = gSavedSettings.getBOOL("ClearBeaconAfterTeleport");
@@ -293,6 +294,7 @@ void LLPrefsAscentSys::cancel()
{
//General -----------------------------------------------------------------------------
gSavedSettings.setBOOL("DoubleClickTeleport", mDoubleClickTeleport);
gSavedSettings.setBOOL("DoubleClickAutoPilot", mDoubleClickAutoPilot);
gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP);
gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight);
gSavedSettings.setBOOL("ClearBeaconAfterTeleport", mClearBeaconAfterTeleport);

1
indra/newview/ascentprefssys.h
View File

@@ -54,6 +54,7 @@ protected:
private:
//General -----------------------------------------------------------------------------
bool mDoubleClickTeleport;
bool mDoubleClickAutoPilot;
bool mResetCameraAfterTP;
bool mOffsetTPByUserHeight;
bool mClearBeaconAfterTeleport;

2
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
View File

@@ -6,7 +6,7 @@
<text left="12" bottom_delta="-20" follows="top" name="double_click_text" value="Enable double-click"/>
<check_box left_delta="105" bottom_delta="-5" control_name="DoubleClickTeleport" follows="top"
label="teleport" tool_tip="Double-clicking on an object/person will teleport you to that location." name="double_click_teleport_check"/>
<check_box left_delta="67" bottom_delta="0" control_name="DoubleClickAutopilot" follows="top" label="autopilot" tool_tip="Double-clicking on something will make you walk to that location." name="double_click_autopilot_check"/>
<check_box left_delta="67" bottom_delta="0" control_name="DoubleClickAutoPilot" follows="top" label="autopilot" tool_tip="Double-clicking on something will make you walk to that location." name="double_click_autopilot_check"/>
<check_box enabled_control="DoubleClickTeleport" left="20" bottom_delta="-18" control_name="OptionRotateCamAfterLocalTP" follows="top" initial_value="false"
label="Reset camera after teleporting" tool_tip="Centers the camera behind you after a local teleport." name="center_after_teleport_check"/>
<check_box enabled_control="DoubleClickTeleport" bottom_delta="-18" control_name="OptionOffsetTPByAgentHeight" follows="left|top" font="SansSerifSmall" height="16" initial_value="false"