diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-03 09:37:03 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-03 09:37:03 -0400 |
commit | b8e97adced58f81a52e6b76a14309d275d55c8bc (patch) | |
tree | 9f2710cbb13093c509896f184a025ab7469c934c /indra/newview/llcallfloater.cpp | |
parent | abc259618f06f69ba8e7c72cb149bcddc1bb6ddf (diff) | |
parent | e58c809a5816383674d0f1957440fad728e88893 (diff) |
merge changes for OPEN-39
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
-rw-r--r-- | indra/newview/llcallfloater.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 328c326278..945a760d05 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 |