diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-20 09:56:57 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-20 09:56:57 +0100 |
| commit | 301f0c6a3b28a3040f8cb36e73d3b367a9262724 (patch) | |
| tree | 97c37b2db9701f01f9872b58a414990bbc311de4 /indra/newview/llviewermenu.cpp | |
| parent | c2a87df2bccbf6e662f3a4c4edb210748ffa692d (diff) | |
| parent | b92ca367aed209b6e8007035ea307d5a0c8d53dc (diff) | |
merge.
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; } }; |