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.h | |
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.h')
-rw-r--r-- | indra/llui/llfloater.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 4b738f88ea..07b79d5523 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -447,9 +447,10 @@ private: LLUIString mTitle; LLUIString mShortTitle; - BOOL mSingleInstance; // TRUE if there is only ever one instance of the floater - bool mReuseInstance; // true if we want to hide the floater when we close it instead of destroying it - std::string mInstanceName; // Store the instance name so we can remove ourselves from the list + BOOL mSingleInstance; // TRUE if there is only ever one instance of the floater + bool mReuseInstance; // true if we want to hide the floater when we close it instead of destroying it + bool mIsReuseInitialized; // true if mReuseInstance already set from parameters + std::string mInstanceName; // Store the instance name so we can remove ourselves from the list BOOL mCanTearOff; BOOL mCanMinimize; |