diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-18 18:46:36 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-18 18:46:36 -0500 |
| commit | d701824c0b5fdffd68d3f38974ec112fd5a343d3 (patch) | |
| tree | b95e16c890ab4c4c6a12e9330d572e3584c6e733 /indra/newview/llviewermenu.cpp | |
| parent | fa2aeb07f8474cfd5d61d5347dfcc28bd8f7f257 (diff) | |
| parent | f735f8d978428bd20868605d9bb4d4895586ebec (diff) | |
merge fix for STORM-316
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; } }; |