Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this should fix the poslock button being weird

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-06 15:57:57 -03:00
parent e7cf7e7b5f
commit 2faf2431f0
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llvoiceremotectrl.cpp
View File

@@ -77,13 +77,16 @@ BOOL LLVoiceRemoteCtrl::postBuild()
mTalkLockBtn->setClickedCallback(onBtnLock); mTalkLockBtn->setClickedCallback(onBtnLock);
mTalkLockBtn->setCallbackUserData(this); mTalkLockBtn->setCallbackUserData(this);
mPosLockBtn = getChild<LLButton>("pos_lock_btn");
mPosLockBtn->setClickedCallback(onClickPosLock);
mPosLockBtn->setCallbackUserData(this);
mSpeakersBtn = getChild<LLButton>("speakers_btn"); mSpeakersBtn = getChild<LLButton>("speakers_btn");
mSpeakersBtn->setClickedCallback(onClickSpeakers); mSpeakersBtn->setClickedCallback(onClickSpeakers);
mSpeakersBtn->setCallbackUserData(this); mSpeakersBtn->setCallbackUserData(this);
childSetAction("show_channel", onClickPopupBtn, this); childSetAction("show_channel", onClickPopupBtn, this);
childSetAction("end_call_btn", onClickEndCall, this); childSetAction("end_call_btn", onClickEndCall, this);
childSetAction("pos_lock_btn", onClickPosLock, this);
@@ -100,6 +103,7 @@ void LLVoiceRemoteCtrl::draw()
} }
mTalkBtn->setEnabled(voice_active); mTalkBtn->setEnabled(voice_active);
mPosLockBtn->setEnabled(voice_active);
mTalkLockBtn->setEnabled(voice_active); mTalkLockBtn->setEnabled(voice_active);
// propagate ptt state to button display, // propagate ptt state to button display,
@@ -109,8 +113,10 @@ void LLVoiceRemoteCtrl::draw()
mTalkBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled") || gVoiceClient->getUserPTTState()); mTalkBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled") || gVoiceClient->getUserPTTState());
} }
mSpeakersBtn->setToggleState(LLFloaterActiveSpeakers::instanceVisible(LLSD())); mSpeakersBtn->setToggleState(LLFloaterActiveSpeakers::instanceVisible(LLSD()));
mPosLockBtn->setToggleState(gVoiceClient->getPosLocked());
mTalkLockBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled")); mTalkLockBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
std::string talk_blip_image; std::string talk_blip_image;
if (gVoiceClient->getIsSpeaking(gAgent.getID())) if (gVoiceClient->getIsSpeaking(gAgent.getID()))
{ {
@@ -163,10 +169,6 @@ void LLVoiceRemoteCtrl::draw()
&& current_channel->isActive() && current_channel->isActive()
&& current_channel != LLVoiceChannelProximal::getInstance()); && current_channel != LLVoiceChannelProximal::getInstance());
childSetEnabled("pos_lock_btn", LLVoiceClient::voiceEnabled()
&& current_channel
&& current_channel->isActive());
LLButton* expand_button = getChild<LLButton>("show_channel"); LLButton* expand_button = getChild<LLButton>("show_channel");

1
indra/newview/llvoiceremotectrl.h
View File

@@ -60,6 +60,7 @@ protected:
LLButton* mTalkBtn; LLButton* mTalkBtn;
LLButton* mTalkLockBtn; LLButton* mTalkLockBtn;
LLButton* mSpeakersBtn; LLButton* mSpeakersBtn;
LLButton* mPosLockBtn;
}; };
#endif // LL_LLVOICEREMOTECTRL_H #endif // LL_LLVOICEREMOTECTRL_H