diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-16 20:39:40 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-16 20:39:40 +0000 |
| commit | 5e9e67cb2d1d3dfc82dfe96103270b2341991ddd (patch) | |
| tree | 2df2a064523b2bffef6ff7566399c76b1f2cc196 /indra/llui/llfloater.cpp | |
| parent | 1ada34fc0c5dc20bffba231ef513b569dbec32ea (diff) | |
merge -r 59028:59178 maintenance -> release.
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 3b855a6360..0922de70af 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -489,6 +489,15 @@ void LLFloater::setVisible( BOOL visible ) void LLFloater::open() /* Flawfinder: ignore */ { + if (mSoundFlags != SILENT + // don't play open sound for hosted (tabbed) windows + && !getHost() + && !sHostp + && (!getVisible() || isMinimized())) + { + make_ui_sound("UISndWindowOpen"); + } + //RN: for now, we don't allow rehosting from one multifloater to another // just need to fix the bugs LLMultiFloater* hostp = getHost(); @@ -509,14 +518,6 @@ void LLFloater::open() /* Flawfinder: ignore */ setVisibleAndFrontmost(mAutoFocus); } - if (mSoundFlags != SILENT) - { - if (!getVisible() || isMinimized()) - { - make_ui_sound("UISndWindowOpen"); - } - } - onOpen(); } @@ -535,6 +536,7 @@ void LLFloater::close(bool app_quitting) if (mSoundFlags != SILENT && getVisible() + && !getHost() && !app_quitting) { make_ui_sound("UISndWindowClose"); @@ -2458,7 +2460,6 @@ void LLMultiFloater::open() /* Flawfinder: ignore */ if (mTabContainer->getTabCount() > 0) { LLFloater::open(); /* Flawfinder: ignore */ - resizeToContents(); } else { |