diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:48:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 19:48:25 +0300 |
| commit | 1bcc4e7f709bf7067121b5891f3f7db3b99235a0 (patch) | |
| tree | bc9cea56b8e236f52df392084552018c387cff2c /indra/newview/lllogininstance.h | |
| parent | 09454c53a48e88a9cdd54f68ac507694a766b213 (diff) | |
| parent | 428f21cf795f440f69a772b314f877ea0c6d4741 (diff) | |
Merge pull request #1313 from secondlife/marchcat/x-merge
Release (Maint YZ) -> Maint X merge
Diffstat (limited to 'indra/newview/lllogininstance.h')
| -rw-r--r-- | indra/newview/lllogininstance.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h index 2e9aab7c00..74d6890d1d 100644 --- a/indra/newview/lllogininstance.h +++ b/indra/newview/lllogininstance.h @@ -90,7 +90,7 @@ private: void attemptComplete() { mAttemptComplete = true; } // In the future an event? - boost::scoped_ptr<LLLogin> mLoginModule; + std::unique_ptr<LLLogin> mLoginModule; LLNotificationsInterface* mNotifications; std::string mLoginState; |