diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-05-07 20:32:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-05-07 20:32:04 -0400 |
| commit | 26fb5d7af70f20c9a125575e1d93f7ff4bcd4f3c (patch) | |
| tree | 2eefde15cd779dfb8398f774c63c2d5b1cbcdfc9 /indra/llui | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
SL-15241: Tweak viewer sources to permit compiling on Mac with C++17.
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; /** |