diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-11-16 11:44:55 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-11-16 11:44:55 -0700 |
commit | 353329c2c2e9e8fa1ff273de2016c9e155585f45 (patch) | |
tree | f5098b9532f6d7b757b9a8fb345e7aa5e7e69108 /indra/newview/llnotificationmanager.h | |
parent | e95b7efd0b4469ce18bce3bc0261ecc9be06ea9c (diff) | |
parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) |
DRTVWR-546 merge in master v6.5.1
Diffstat (limited to 'indra/newview/llnotificationmanager.h')
-rw-r--r-- | indra/newview/llnotificationmanager.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llnotificationmanager.h b/indra/newview/llnotificationmanager.h index 52c79cc689..cf987ff4e9 100644 --- a/indra/newview/llnotificationmanager.h +++ b/indra/newview/llnotificationmanager.h @@ -35,8 +35,6 @@ #include <map> #include <string> -#include <boost/shared_ptr.hpp> - namespace LLNotificationsUI { class LLToast; @@ -60,7 +58,7 @@ public: void onChat(const LLChat& msg, const LLSD &args); private: - boost::shared_ptr<class LLFloaterIMNearbyChatHandler> mChatHandler; + std::shared_ptr<class LLFloaterIMNearbyChatHandler> mChatHandler; std::vector<LLNotificationChannelPtr> mChannels; }; |