diff options
author | Oz Linden <oz@lindenlab.com> | 2010-11-18 18:57:52 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-11-18 18:57:52 -0500 |
commit | d67c395800f8e7f78abd7e23f8ef4c86a2a81830 (patch) | |
tree | 11d5b9f9c0c6d28d959ea63b1127a0e931bde69f /indra/newview/llviewermenu.cpp | |
parent | 3eb3198248395922a1dfe277399e1a3cd235f952 (diff) | |
parent | d701824c0b5fdffd68d3f38974ec112fd5a343d3 (diff) |
merge fix for STORM-654
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 2874a6ec79..54fe34e738 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6500,16 +6500,6 @@ class LLToggleControl : public view_listener_t std::string control_name = userdata.asString(); BOOL checked = gSavedSettings.getBOOL( control_name ); gSavedSettings.setBOOL( control_name, !checked ); - - // Doubleclick actions - there can be only one - if ((control_name == "DoubleClickAutoPilot") && !checked) - { - gSavedSettings.setBOOL( "DoubleClickTeleport", FALSE ); - } - else if ((control_name == "DoubleClickTeleport") && !checked) - { - gSavedSettings.setBOOL( "DoubleClickAutoPilot", FALSE ); - } return true; } }; |