diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
commit | 353d2059fc33174010127863a25983b918115361 (patch) | |
tree | f2e08370b140352957b4d7757e59e0fe673f5a14 /indra/newview/llviewermenu.cpp | |
parent | 7610c0c050a84ebdf08b8e206eb7fe5e190dedb2 (diff) | |
parent | d86eb3dd42d39e6b7647b6680100aeafe2173d36 (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 6f06e766e8..54fc4a2bb7 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5592,6 +5592,14 @@ class LLToggleHelp : public view_listener_t } }; +class LLToggleSpeak : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + LLVoiceClient::getInstance()->toggleUserPTTState(); + return true; + } +}; class LLShowSidetrayPanel : public view_listener_t { bool handleEvent(const LLSD& userdata) @@ -8218,6 +8226,7 @@ void initialize_menus() commit.add("BuyCurrency", boost::bind(&handle_buy_currency)); view_listener_t::addMenu(new LLShowHelp(), "ShowHelp"); view_listener_t::addMenu(new LLToggleHelp(), "ToggleHelp"); + view_listener_t::addMenu(new LLToggleSpeak(), "ToggleSpeak"); view_listener_t::addMenu(new LLPromptShowURL(), "PromptShowURL"); view_listener_t::addMenu(new LLShowAgentProfile(), "ShowAgentProfile"); view_listener_t::addMenu(new LLToggleAgentProfile(), "ToggleAgentProfile"); |