From c80df5ac39e31fb17fa8a1158cbea2de8faf0319 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Fri, 23 Sep 2011 18:00:35 +0300 Subject: STORM-1612 FIXED Implemented click-to-walk in Advanced mode. Changes: * Click and double click in-world can now trigger click-to-walk or click-to-teleport actions, depending on preferences. * Grouped keyboard- and mouse-related settings in Preferences -> Move. --- indra/newview/llfloaterpreference.h | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'indra/newview/llfloaterpreference.h') diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index ef9bc2dd53..b7263f0ac3 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -104,14 +104,23 @@ protected: void setHardwareDefaults(); // callback for when client turns on shaders void onVertexShaderEnable(); - // callback for changing double click action checkbox - void onDoubleClickCheckBox(LLUICtrl* ctrl); - // callback for selecting double click action radio-button - void onDoubleClickRadio(); - // updates double-click action settings depending on controls from preferences - void updateDoubleClickSettings(); - // updates double-click action controls depending on values from settings.xml - void updateDoubleClickControls(); + + // callback for clicking the "Walk to Click Point" checkbox + void onWalkCheckboxCommit(); + // callback for clicking the "Teleport to Click Point" checkbox + void onTeleportCheckboxCommit(); + // callback for selecting trigger for "Walk to Click Point" + void onWalkTriggerRadioCommit(); + // callback for selecting trigger for "Teleport to Click Point" + void onTeleportTriggerRadioCommit(); + // make sure the radio buttons have mutually exclusive values + void fixWalkRadioValue(); + // make sure the radio buttons have mutually exclusive values + void fixTeleportRadioValue(); + // updates click/double-click action settings depending on controls values + void updateClickActionSettings(); + // updates click/double-click action controls depending on values from settings.xml + void updateClickActionControls(); // This function squirrels away the current values of the controls so that // cancel() can restore them. @@ -166,7 +175,7 @@ private: static std::string sSkin; // set true if state of double-click action checkbox or radio-group was changed by user // (reset back to false on apply or cancel) - bool mDoubleClickActionDirty; + bool mClickActionDirty; ///< Set to true when the click/double-click options get changed by user. bool mGotPersonalInfo; bool mOriginalIMViaEmail; bool mLanguageChanged; -- cgit v1.2.3 From f6a8a2c5460c8f61b37154de01cd2f9575ef87de Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Thu, 29 Sep 2011 15:35:02 +0300 Subject: STORM-1612 WIP Implemented new click-to-walk/teleport preferences design. --- indra/newview/llfloaterpreference.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'indra/newview/llfloaterpreference.h') diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index b7263f0ac3..5c74e9f60c 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -105,18 +105,8 @@ protected: // callback for when client turns on shaders void onVertexShaderEnable(); - // callback for clicking the "Walk to Click Point" checkbox - void onWalkCheckboxCommit(); - // callback for clicking the "Teleport to Click Point" checkbox - void onTeleportCheckboxCommit(); - // callback for selecting trigger for "Walk to Click Point" - void onWalkTriggerRadioCommit(); - // callback for selecting trigger for "Teleport to Click Point" - void onTeleportTriggerRadioCommit(); - // make sure the radio buttons have mutually exclusive values - void fixWalkRadioValue(); - // make sure the radio buttons have mutually exclusive values - void fixTeleportRadioValue(); + // callback for commit in the "Single click on land" and "Double click on land" comboboxes. + void onClickActionChange(); // updates click/double-click action settings depending on controls values void updateClickActionSettings(); // updates click/double-click action controls depending on values from settings.xml @@ -173,8 +163,6 @@ public: static void refreshSkin(void* data); private: static std::string sSkin; - // set true if state of double-click action checkbox or radio-group was changed by user - // (reset back to false on apply or cancel) bool mClickActionDirty; ///< Set to true when the click/double-click options get changed by user. bool mGotPersonalInfo; bool mOriginalIMViaEmail; -- cgit v1.2.3