diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-24 18:57:04 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-09-24 18:57:04 +0300 |
| commit | f9e0831ba04f99335bfb494a22435446dc0852de (patch) | |
| tree | f6a0bdcc4d76bab0e42f9dc6168d3f5447f58e1a /indra/llui/llfloater.cpp | |
| parent | a3b36bad821907f9b30891c45e7901b92366be52 (diff) | |
CHUI-355 FIXED Nearby chat entries do not appear in torn off nearby chat window when opening from a toast:
moved setIsSingleInstance() from constructor to postBuild() for prevent of a resetting it in buildFromXML();
implemented correct set of mReuseInstance;
changed type of the key of LLIMConversation from LLUUID() to LLSD()
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 + } } |