aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoiceremotectrl.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvoiceremotectrl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llvoiceremotectrl.cpp b/linden/indra/newview/llvoiceremotectrl.cpp
index 1681e96..d11424b 100644
--- a/linden/indra/newview/llvoiceremotectrl.cpp
+++ b/linden/indra/newview/llvoiceremotectrl.cpp
@@ -114,14 +114,16 @@ void LLVoiceRemoteCtrl::draw()
114 LLFloaterActiveSpeakers::getInstance()->onClose(false); 114 LLFloaterActiveSpeakers::getInstance()->onClose(false);
115 mVoiceLastActive = voice_active; 115 mVoiceLastActive = voice_active;
116 116
117 static BOOL *sPTTCurrentlyEnabled = rebind_llcontrol<BOOL>("PTTCurrentlyEnabled", &gSavedSettings, true);
118
117 // propagate ptt state to button display, 119 // propagate ptt state to button display,
118 if (!mTalkBtn->hasMouseCapture()) 120 if (!mTalkBtn->hasMouseCapture())
119 { 121 {
120 // not in push to talk mode, or push to talk is active means I'm talking 122 // not in push to talk mode, or push to talk is active means I'm talking
121 mTalkBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled") || gVoiceClient->getUserPTTState()); 123 mTalkBtn->setToggleState(!(*sPTTCurrentlyEnabled) || gVoiceClient->getUserPTTState());
122 } 124 }
123 mSpeakersBtn->setToggleState(LLFloaterActiveSpeakers::instanceVisible(LLSD())); 125 mSpeakersBtn->setToggleState(LLFloaterActiveSpeakers::instanceVisible(LLSD()));
124 mTalkLockBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled")); 126 mTalkLockBtn->setToggleState(!(*sPTTCurrentlyEnabled));
125 127
126 std::string talk_blip_image; 128 std::string talk_blip_image;
127 if (gVoiceClient->getIsSpeaking(gAgent.getID())) 129 if (gVoiceClient->getIsSpeaking(gAgent.getID()))