diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-29 21:21:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-29 21:21:36 -0400 |
| commit | f6ddd71214a284ffcc96c1bd7d3964ec7378e84a (patch) | |
| tree | fb404185928ca6b18c601961d3d06d67887fd624 /indra | |
| parent | b5001ff819f789e51929d4fe29db7fc05ddd4468 (diff) | |
| parent | b91205ccf041df02323519bfdf86784a13d05748 (diff) | |
merge changes for storm-1392
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 01d19c5ba0..79e6c7b66b 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -386,6 +386,7 @@ void LLBottomTray::onChange(EStatusType status, const std::string &channelURI, b { bool voice_status = LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking(); getChild<LLButton>("speak_flyout_btn")->setEnabled(voice_status); + gMenuBarView->getChild<LLView>("Nearby Voice")->setEnabled(voice_status); if (voice_status) { LLFirstUse::speak(true); @@ -570,7 +571,7 @@ BOOL LLBottomTray::postBuild() // it takes some time between logging in to world and connecting to voice channel. getChild<LLButton>("speak_btn")->setEnabled(false); getChild<LLButton>("speak_flyout_btn")->setEnabled(false); - + gMenuBarView->getChild<LLView>("Nearby Voice")->setEnabled(false); // Registering Chat Bar to receive Voice client status change notifications. LLVoiceClient::getInstance()->addObserver(this); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 81046e99a0..a0d0c8625e 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -232,6 +232,16 @@ function="SideTray.PanelPeopleTab" parameter="nearby_panel" /> </menu_item_call> + <menu_item_check + label="Nearby Voice" + name="Nearby Voice"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="voice_controls" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="voice_controls" /> + </menu_item_check> </menu> <menu create_jump_keys="true" |