diff options
| author | Richard Linden <none@none> | 2010-08-05 11:19:42 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-05 11:19:42 -0700 |
| commit | 5e56b2d4acaecf6b1c9e1789748b90836a7bd2c6 (patch) | |
| tree | fc6a18bce3c560e5a5fbd25b224cc0d9ab580628 /indra/llui/lldockablefloater.h | |
| parent | b2028085fdfddfd5a7ac0f52d9f34b84457b3b98 (diff) | |
| parent | c89ff6e80be24f3c4c910b7f380ff587f5853455 (diff) | |
merge
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 */ |