diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-19 13:22:07 -0800 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-19 13:22:07 -0800 |
commit | 2eec4949cc49f3c59cdc278be0e7eed1e092b167 (patch) | |
tree | c46a24bf021dccd724ba199bcf48a9b9b6ff0aca /indra/newview/llviewermenu.cpp | |
parent | 9053aa7d1cb53445f7c7e8d929e3850807b52228 (diff) | |
parent | 1139584b026db86fd20364d0eb21b6e2351f8fb1 (diff) |
Merge latest from lindenlab/viewer-development
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; } }; |