diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:22:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:22:26 -0400 |
| commit | b595bbcf2af03b2a285c2df450379b670bddbfbc (patch) | |
| tree | 121ab3e96f6e72d53c5a4f84d761f13e1996bbda /indra/newview/llcallfloater.cpp | |
| parent | fbd241da54ad6017825b59c5b0c71086d8b8957a (diff) | |
| parent | 7cb4f2d87dc8619d8ad86cb82f6687f1a9821a69 (diff) | |
merge changes for storm-1019
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 |