diff options
| author | Callum Linden <callum@lindenlab.com> | 2022-08-29 10:14:06 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2022-08-29 10:14:06 -0700 |
| commit | a3f7f7d8c08e19d338911e107707f756469716bc (patch) | |
| tree | c86773c81cbcb03300132eb684134b878aeca357 /indra/newview/lltoast.h | |
| parent | 35de5fc912c908fb1c3c5257f28e72ffebe796c4 (diff) | |
| parent | 592abc460c96b63b1b1e0d15914f7b64a0c88038 (diff) | |
Merge remote-tracking branch 'origin/more-c++17' into DRTVWR-568
Diffstat (limited to 'indra/newview/lltoast.h')
| -rw-r--r-- | indra/newview/lltoast.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h index 69074b1670..ab559f1e6f 100644 --- a/indra/newview/lltoast.h +++ b/indra/newview/lltoast.h @@ -35,6 +35,7 @@ #include "llviewercontrol.h" #include "lltexteditor.h" +#include <memory> #define MOUSE_LEAVE false #define MOUSE_ENTER true @@ -222,7 +223,7 @@ private: LLPanel* mWrapperPanel; // timer counts a lifetime of a toast - std::auto_ptr<LLToastLifeTimer> mTimer; + std::unique_ptr<LLToastLifeTimer> mTimer; F32 mToastLifetime; // in seconds F32 mToastFadingTime; // in seconds |