Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloaterauction.h b/indra/newview/llfloaterauction.h
index c83a11ba8b..04935c7c9e 100644
--- a/indra/newview/llfloaterauction.h
+++ b/indra/newview/llfloaterauction.h
@@ -47,8 +47,8 @@ class LLFloaterAuction : public LLFloater
 	friend class LLFloaterReg;
 public:
 	// LLFloater interface
-	/*virtual*/ void onOpen(const LLSD& key);
-	/*virtual*/ void draw();
+	void onOpen(const LLSD& key) override;
+	void draw() override;
 
 private:
 	
@@ -63,7 +63,7 @@ private:
 	bool onSellToAnyoneConfirmed(const LLSD& notification, const LLSD& response);	// Sell confirmation clicked
 	static void onClickStartAuction(void* data);
 
-	/*virtual*/ BOOL postBuild();
+	bool postBuild() override;
 
 	void doResetParcel();
 	void doSellToAnyone();