Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llpanelmarketplaceinbox.h b/indra/newview/llpanelmarketplaceinbox.h
index 1393bc1efe..e711bb5e5c 100644
--- a/indra/newview/llpanelmarketplaceinbox.h
+++ b/indra/newview/llpanelmarketplaceinbox.h
@@ -48,11 +48,11 @@ public:
     LLPanelMarketplaceInbox(const Params& p = getDefaultParams());
     ~LLPanelMarketplaceInbox();
 
-    /*virtual*/ BOOL postBuild();
+    bool postBuild() override;
 
-    /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);
+    bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg) override;
 
-    /*virtual*/ void draw();
+    void draw() override;
 
     LLInventoryPanel * setupInventoryPanel();
 
@@ -68,7 +68,7 @@ private:
 
     void onSelectionChange();
 
-    void onFocusReceived();
+    void onFocusReceived() override;
 
 private:
     LLUICtrl *          mFreshCountCtrl;