diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-05-27 21:15:49 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-05-27 21:15:49 +0000 |
| commit | 3f98411c56f4daa06c9102346a8dd37af18d2cb6 (patch) | |
| tree | 4255c2827cc3e07921275bfd7937f4f43f29d5fa /indra/newview/llstartup.h | |
| parent | 3f58ec2fdfb76ce2160884a3e97be49f60b6ac90 (diff) | |
| parent | 02c71b0ac2f99dd1c26a649ffce2182b2fc9a7d9 (diff) | |
Merged in DV528-merge-6.6.1 (pull request #1000)
DRTVWR-528 merge up to 6.6.1
Diffstat (limited to 'indra/newview/llstartup.h')
| -rw-r--r-- | indra/newview/llstartup.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h index 116aeb36a7..fe8e215f76 100644 --- a/indra/newview/llstartup.h +++ b/indra/newview/llstartup.h @@ -27,7 +27,7 @@ #ifndef LL_LLSTARTUP_H #define LL_LLSTARTUP_H -#include <boost/scoped_ptr.hpp> +#include <memory> // unique_ptr class LLViewerTexture ; class LLEventPump; @@ -130,9 +130,9 @@ private: static std::string startupStateToString(EStartupState state); static EStartupState gStartupState; // Do not set directly, use LLStartup::setStartupState - static boost::scoped_ptr<LLEventPump> sStateWatcher; - static boost::scoped_ptr<LLStartupListener> sListener; - static boost::scoped_ptr<LLViewerStats::PhaseMap> sPhases; + static std::unique_ptr<LLEventPump> sStateWatcher; + static std::unique_ptr<LLStartupListener> sListener; + static std::unique_ptr<LLViewerStats::PhaseMap> sPhases; }; |