Skip to content
Snippets Groups Projects
Commit aa628750 authored by Jonathan Yap's avatar Jonathan Yap
Browse files

STORM-1077 Change hint wording. Disable hint if speak or flyout button is pressed.

parent f818d1a5
No related branches found
No related tags found
No related merge requests found
......@@ -50,6 +50,7 @@
#include "llviewerwindow.h"
#include "llvoicechannel.h"
#include "llviewerparcelmgr.h"
#include "llfirstuse.h"
static void get_voice_participants_uuids(uuid_vec_t& speakers_uuids);
void reshape_floater(LLCallFloater* floater, S32 delta_height);
......@@ -170,13 +171,13 @@ BOOL LLCallFloater::postBuild()
updateTransparency(TT_ACTIVE); // force using active floater transparency (STORM-730)
updateSession();
return TRUE;
}
// virtual
void LLCallFloater::onOpen(const LLSD& /*key*/)
{
LLFirstUse::speak(false);
}
// virtual
......
......@@ -38,6 +38,7 @@
#include "llspeakbutton.h"
#include "llbottomtray.h"
#include "llfirstuse.h"
static LLDefaultChildRegistry::Register<LLSpeakButton> t1("talk_button");
......@@ -176,10 +177,12 @@ void LLSpeakButton::onMouseDown_SpeakBtn()
{
bool down = true;
LLVoiceClient::getInstance()->inputUserControlState(down); // this method knows/care about whether this translates into a toggle-to-talk or down-to-talk
LLFirstUse::speak(false);
}
void LLSpeakButton::onMouseUp_SpeakBtn()
{
bool down = false;
LLVoiceClient::getInstance()->inputUserControlState(down);
LLFirstUse::speak(false);
}
......@@ -6611,9 +6611,7 @@ Mute everyone?
label="Speak"
type="hint"
unique="true">
Click the Speak button to turn your microphone off and on.
Your microphone is on by default.
Click the Speak button to turn your microphone on and off.
Click on the up arrow to see the voice control panel.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment