diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-09-15 11:45:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-09-15 11:45:50 -0400 |
| commit | e44011c3befe5f833490731baac90f418486cdea (patch) | |
| tree | d8ca7432bf8ac7f0130c8dd37428efc541cba97b /indra/newview/llviewermenu.cpp | |
| parent | b6a39ffa214dea8045a768bcfd83f2e1cab13c9b (diff) | |
| parent | bf2849ef2346b41ab096c4c7ce44756e3e20cd27 (diff) | |
pull fix for VWR-20694 / STORM-155
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index daeace0ec5..f62223a38d 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6573,6 +6573,16 @@ 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; } }; |