diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-11 09:10:33 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-11 09:10:33 -0700 |
| commit | 05b31ff3b235bdcf7e9bb0fe1ff701c006e8ec66 (patch) | |
| tree | 4fd5e083694142609bd099cf71e092f9c7457e9f /indra/newview/llbottomtray.cpp | |
| parent | 0620e6a79149e455744131703e8bdb74864b69be (diff) | |
| parent | c845925eebb5cad3049ee0f3b1d0adea3e3a46b5 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 98712f1334..af91702f9b 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -387,6 +387,9 @@ void LLBottomTray::onChange(EStatusType status, const std::string &channelURI, b if (status != STATUS_JOINING && status!= STATUS_LEFT_CHANNEL) { bool voice_status = LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking(); + + gAgent.setVoiceConnected(voice_status); + getChild<LLButton>("speak_flyout_btn")->setEnabled(voice_status); gMenuBarView->getChild<LLView>("Nearby Voice")->setEnabled(voice_status); if (voice_status) |