From c010c098fcd6f496989195b5b5168f6f5914a5ea Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 3 Mar 2019 15:35:13 -0500 Subject: [PATCH] Updates --- indra/newview/llinventorypanel.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index ae7bf60a1..90f4263f2 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -73,7 +73,8 @@ class LLInventoryPanelObserver : public LLInventoryObserver public: LLInventoryPanelObserver(LLInventoryPanel* ip) : mIP(ip) {} virtual ~LLInventoryPanelObserver() {} - virtual void changed(U32 mask) + + void changed(U32 mask) override { mIP->modelChanged(mask); } @@ -97,7 +98,7 @@ protected: class LLInvPanelComplObserver : public LLInventoryCompletionObserver { public: - typedef boost::function callback_t; + typedef std::function callback_t; LLInvPanelComplObserver(callback_t cb) : mCallback(cb) @@ -107,7 +108,7 @@ public: void reset(); private: - /*virtual*/ void done(); + /*virtual*/ void done() override; /// Called when all the items are complete. callback_t mCallback;