diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:21:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:21:41 -0400 |
| commit | 7cb4f2d87dc8619d8ad86cb82f6687f1a9821a69 (patch) | |
| tree | 76eb80864288acd35fa7b0892a5aba96c13a860c /indra/newview/llcallfloater.cpp | |
| parent | 39d83cb74f5978e926ff02dcb20a64802429bc69 (diff) | |
| parent | 9c0757511ec4ed12b47c6d3fd2ef20fca6828a6e (diff) | |
merge changes for storm-1086
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 |