diff options
author | Richard Linden <none@none> | 2011-04-01 16:42:46 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-04-01 16:42:46 -0700 |
commit | 88c5554a288d1785aa391dc5ff7b7897a7a724a9 (patch) | |
tree | 0305d5ce1f0bb5e544cd75275a137b372a08293d /indra/newview/llcallfloater.cpp | |
parent | 774b9ac9f9f87af65a7356d7f9a25e204428d4aa (diff) | |
parent | 453b0c700a8712f7ff79434772296a487d38184a (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
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 |