diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-27 19:24:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-27 19:24:05 +0300 |
| commit | 203ea3a70a775a09cbbffb1740ab7c58f1780baa (patch) | |
| tree | 828b0ea2336944d7ab0cc78704ae364966ec98a1 /indra/llui | |
| parent | 8e3f0778863a5aa337d1148a243ea91d238a8ac5 (diff) | |
| parent | 2e790e9b7250d5f79751fa5287c1993f3fa5c776 (diff) | |
Merge branch 'c++17' into DRTVWR-522-maint
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lldockablefloater.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h index 89c9852f4a..1110342f08 100644 --- a/indra/llui/lldockablefloater.h +++ b/indra/llui/lldockablefloater.h @@ -108,7 +108,7 @@ public: * * By default returns false. */ - virtual bool overlapsScreenChannel() { return mOverlapsScreenChannel && getVisible() && isDocked(); } + virtual bool overlapsScreenChannel() const { return mOverlapsScreenChannel && getVisible() && isDocked(); } virtual void setOverlapsScreenChannel(bool overlaps) { mOverlapsScreenChannel = overlaps; } bool getUniqueDocking() { return mUniqueDocking; } @@ -131,7 +131,7 @@ protected: boost::function<BOOL ()> mIsDockedStateForcedCallback; private: - std::auto_ptr<LLDockControl> mDockControl; + std::unique_ptr<LLDockControl> mDockControl; LLUIImagePtr mDockTongue; static LLHandle<LLFloater> sInstanceHandle; /** |