diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-25 08:36:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-25 08:36:20 -0700 |
| commit | 0fd91052a82c2a2598bcd9cad667285b700899b2 (patch) | |
| tree | db66165975ed36d6a8295e7df041aee24fb5b764 /indra/llui/llfloater.cpp | |
| parent | 5b0e06108b3c4373c55103dedab3306f06d392c9 (diff) | |
| parent | b28cb6843cdfedbd059ae3961cb528339127fbfd (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 029c47c726..58b17f74a8 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -240,6 +240,7 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p) mTitle(p.title), mShortTitle(p.short_title), mSingleInstance(p.single_instance), + mIsReuseInitialized(p.reuse_instance.isProvided()), mReuseInstance(p.reuse_instance.isProvided() ? p.reuse_instance : p.single_instance), // reuse single-instance floaters by default mKey(key), mCanTearOff(p.can_tear_off), @@ -631,6 +632,10 @@ void LLFloater::setVisible( BOOL visible ) void LLFloater::setIsSingleInstance(BOOL is_single_instance) { mSingleInstance = is_single_instance; + if (!mIsReuseInitialized) + { + mReuseInstance = is_single_instance; // reuse single-instance floaters by default + } } |