diff -r e34c46682d97 indra/newview/llcallfloater.cpp --- a/indra/newview/llcallfloater.cpp Wed Mar 23 20:48:53 2011 -0400 +++ b/indra/newview/llcallfloater.cpp Thu Mar 24 12:06:50 2011 -0400 @@ -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 @@ 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 -r e34c46682d97 indra/newview/llspeakbutton.cpp --- a/indra/newview/llspeakbutton.cpp Wed Mar 23 20:48:53 2011 -0400 +++ b/indra/newview/llspeakbutton.cpp Thu Mar 24 12:06:50 2011 -0400 @@ -38,6 +38,7 @@ #include "llspeakbutton.h" #include "llbottomtray.h" +#include "llfirstuse.h" static LLDefaultChildRegistry::Register t1("talk_button"); @@ -176,10 +177,12 @@ { 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 -r e34c46682d97 indra/newview/skins/default/xui/en/notifications.xml --- a/indra/newview/skins/default/xui/en/notifications.xml Wed Mar 23 20:48:53 2011 -0400 +++ b/indra/newview/skins/default/xui/en/notifications.xml Thu Mar 24 12:06:50 2011 -0400 @@ -6611,9 +6611,7 @@ 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.