diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:39:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:39:31 -0400 |
| commit | 60bceb759b592348b403689ffa8ed9c768126f8b (patch) | |
| tree | 33b0ece80cc12f390683d89c30f2a706fa87bd50 /indra/newview/llcallfloater.cpp | |
| parent | c9c192e2c476e73807d23cdda0814cb221a96b95 (diff) | |
| parent | e2baffa940a5797f2055f13ceb9722de524b2ec3 (diff) | |
merge changes for storm-954
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 |