diff options
author | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:51:12 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:51:12 -0500 |
commit | 1630bd4149cc8637f01eea82e4497dbf0d76b777 (patch) | |
tree | 6c06b7a5a33217d23e752e9336f024e082aeecee /indra/newview/llviewermenu.cpp | |
parent | f0a0831954475a2f49fe7473046f0ba657fb2405 (diff) | |
parent | bf5e9b8374c905b795339ca6426034e237ed5378 (diff) |
merge fix for STORM-560
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; } }; |