diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-08-02 21:00:02 +0300 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-08-02 21:00:02 +0300 |
| commit | b8b7a61e9e732b16a56ae0bec3b9098ccfd28292 (patch) | |
| tree | 67f92edf0eb5bfdd49232081bad85a96a6c89cd3 /indra/llui/lldockablefloater.h | |
| parent | 4104ba0a3d7aabbec3bb0df1ce233bee4a22496a (diff) | |
EXT-5609 FIXED Avoided showing script floater undocked if it was created in mouselook mode.
Commiting on behalf of Alex Productengine.
- Added check if floater is constructed in mouselook mode and added forcing dock state when floater is shown after constructing in mouselook mode.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/830/
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lldockablefloater.h')
| -rw-r--r-- | indra/llui/lldockablefloater.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h index 2b1ce99ae2..054d59b984 100644 --- a/indra/llui/lldockablefloater.h +++ b/indra/llui/lldockablefloater.h @@ -130,6 +130,10 @@ protected: void setDockControl(LLDockControl* dockControl); const LLUIImagePtr& getDockTongue(); + // Checks if docking should be forced. + // It may be useful e.g. if floater created in mouselook mode (see EXT-5609) + boost::function<BOOL ()> mIsDockedStateForcedCallback; + private: std::auto_ptr<LLDockControl> mDockControl; LLUIImagePtr mDockTongue; @@ -143,6 +147,9 @@ private: bool mUseTongue; bool mOverlapsScreenChannel; + + // Force docking when the floater is being shown for the first time. + bool mForceDocking; }; #endif /* LL_DOCKABLEFLOATER_H */ |