Ported gSavedSettings changes from Emerald (as well as modifying a few of ours)

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()
                 LLFloaterActiveSpeakers::getInstance()->onClose(false);
         mVoiceLastActive = voice_active;
 
+        static BOOL *sPTTCurrentlyEnabled = rebind_llcontrol<BOOL>("PTTCurrentlyEnabled", &gSavedSettings, true);
+
         // propagate ptt state to button display,
         if (!mTalkBtn->hasMouseCapture())
         {
                 // not in push to talk mode, or push to talk is active means I'm talking
-                mTalkBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled") || gVoiceClient->getUserPTTState());
+                mTalkBtn->setToggleState(!(*sPTTCurrentlyEnabled) || gVoiceClient->getUserPTTState());
         }
         mSpeakersBtn->setToggleState(LLFloaterActiveSpeakers::instanceVisible(LLSD()));
-        mTalkLockBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
+        mTalkLockBtn->setToggleState(!(*sPTTCurrentlyEnabled));
 
         std::string talk_blip_image;
         if (gVoiceClient->getIsSpeaking(gAgent.getID()))