From aa628750eb4f465c328b272f7c2db3bc7b48d654 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 24 Mar 2011 12:07:47 -0400
Subject: [PATCH] STORM-1077 Change hint wording. Disable hint if speak or
flyout button is pressed.
---
indra/newview/llcallfloater.cpp | 3 ++-
indra/newview/llspeakbutton.cpp | 3 +++
indra/newview/skins/default/xui/en/notifications.xml | 4 +---
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 328c3262787..945a760d059 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -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
diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp
index c76ecae4a2b..81beb0155f1 100644
--- a/indra/newview/llspeakbutton.cpp
+++ b/indra/newview/llspeakbutton.cpp
@@ -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);
}
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 85b8cac9444..b478cf869ee 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -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.
--
GitLab