Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 6 insertions, 7 deletions

diff --git a/indra/newview/llfloaterbuy.h b/indra/newview/llfloaterbuy.h
index 41e0161ed5..8c8a3efc64 100644
--- a/indra/newview/llfloaterbuy.h
+++ b/indra/newview/llfloaterbuy.h
@@ -49,19 +49,18 @@ public:
     LLFloaterBuy(const LLSD& key);
     ~LLFloaterBuy();
 
-    /*virtual*/ BOOL postBuild();
-    /*virtual*/ void onClose(bool app_quitting);
+    bool postBuild() override;
+    void onClose(bool app_quitting) override;
 
     static void show(const LLSaleInfo& sale_info);
 
 protected:
     void reset();
 
-    void requestObjectInventories();
-    /*virtual*/ void inventoryChanged(LLViewerObject* obj,
-                                 LLInventoryObject::object_list_t* inv,
-                                 S32 serial_num,
-                                 void* data);
+    void inventoryChanged(LLViewerObject* obj,
+        LLInventoryObject::object_list_t* inv,
+        S32 serial_num,
+        void* data) override;
 
     void onSelectionChanged();
     void showViews(bool show);