viewer#848 Xcode buildfix

17 files changed, 20 insertions, 20 deletions

diff --git a/indra/newview/llchicletbar.h b/indra/newview/llchicletbar.h
index fb8c6d400a..1e6671de94 100644
--- a/indra/newview/llchicletbar.h
+++ b/indra/newview/llchicletbar.h
@@ -38,7 +38,7 @@ class LLChicletBar
 	: public LLSingleton<LLChicletBar>
 	, public LLPanel
 {
-	LLSINGLETON(LLChicletBar);
+	LLSINGLETON_C11(LLChicletBar);
 	LOG_CLASS(LLChicletBar);
 
 public:
diff --git a/indra/newview/llfloaterauction.h b/indra/newview/llfloaterauction.h
index a20144d4cf..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:
 	
diff --git a/indra/newview/llfloateravatartextures.h b/indra/newview/llfloateravatartextures.h
index cbbb1b6a57..a9502f400c 100644
--- a/indra/newview/llfloateravatartextures.h
+++ b/indra/newview/llfloateravatartextures.h
@@ -43,7 +43,7 @@ public:
 	bool postBuild() override;
 	void draw() override;
 
-	void refresh();
+	void refresh() override;
 
 private:
 	static void onClickDump(void*);
diff --git a/indra/newview/llfloaterevent.h b/indra/newview/llfloaterevent.h
index a0cd7de9e2..501981a80f 100644
--- a/indra/newview/llfloaterevent.h
+++ b/indra/newview/llfloaterevent.h
@@ -51,7 +51,7 @@ public:
 
 
 protected:
-	/*virtual*/ void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event);	
+	void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event) override;
 	
 	U32				mEventID;
 
diff --git a/indra/newview/llfloatermediasettings.h b/indra/newview/llfloatermediasettings.h
index c3070241b8..f3a218b9f5 100644
--- a/indra/newview/llfloatermediasettings.h
+++ b/indra/newview/llfloatermediasettings.h
@@ -55,7 +55,7 @@ public:
 	const std::string getHomeUrl();	
 	//bool passesWhiteList( const std::string& test_url );
 
-	virtual void	draw();
+	virtual void	draw() override;
 
 	bool mIdenticalHasMediaInfo;
 	bool mMultipleMedia;
diff --git a/indra/newview/llfloaternamedesc.h b/indra/newview/llfloaternamedesc.h
index e6a7c71141..51d70e4c76 100644
--- a/indra/newview/llfloaternamedesc.h
+++ b/indra/newview/llfloaternamedesc.h
@@ -50,7 +50,7 @@ public:
 	S32			getExpectedUploadCost() const;
 	
 protected:
-	virtual void		onCommit();
+	virtual void		onCommit() override;
 
 protected:
 	bool        mIsAudio;
diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h
index 873c6a262a..beeccbdc3b 100644
--- a/indra/newview/llfloaterperms.h
+++ b/indra/newview/llfloaterperms.h
@@ -81,7 +81,7 @@ enum Categories
 
 private:
 	LLFloaterPermsDefault(const LLSD& seed);
-	void refresh();
+	void refresh() override;
 
 	static const std::string sCategoryNames[CAT_LAST]; 
     static void updateCapCoro(std::string url);
diff --git a/indra/newview/llfloatertelehub.h b/indra/newview/llfloatertelehub.h
index 1ee2227f9b..4024c8254e 100644
--- a/indra/newview/llfloatertelehub.h
+++ b/indra/newview/llfloatertelehub.h
@@ -49,7 +49,7 @@ public:
 	static BOOL renderBeacons();
 	static void addBeacons();
 
-	void refresh();
+	void refresh() override;
 	void sendTelehubInfoRequest();
 
 	void onClickConnect();
diff --git a/indra/newview/llfloatertos.h b/indra/newview/llfloatertos.h
index d59ddbe1c4..8e2cff02cc 100644
--- a/indra/newview/llfloatertos.h
+++ b/indra/newview/llfloatertos.h
@@ -60,7 +60,7 @@ public:
 	void			updateAgreeEnabled(bool enabled);
 
 	// inherited from LLViewerMediaObserver
-	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+	void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override;
 
 private:
     static void testSiteIsAliveCoro(LLHandle<LLFloater> handle, std::string url);
diff --git a/indra/newview/llfloatertranslationsettings.h b/indra/newview/llfloatertranslationsettings.h
index 64b21e078d..a111d531da 100644
--- a/indra/newview/llfloatertranslationsettings.h
+++ b/indra/newview/llfloatertranslationsettings.h
@@ -45,7 +45,7 @@ public:
 	void setAzureVerified(bool ok, bool alert, S32 status);
 	void setGoogleVerified(bool ok, bool alert, S32 status);
     void setDeepLVerified(bool ok, bool alert, S32 status);
-	void onClose(bool app_quitting);
+	void onClose(bool app_quitting) override;
 
 private:
 	std::string getSelectedService() const;
diff --git a/indra/newview/llfloatervoiceeffect.h b/indra/newview/llfloatervoiceeffect.h
index cc6ca002a2..3ef210a9c6 100644
--- a/indra/newview/llfloatervoiceeffect.h
+++ b/indra/newview/llfloatervoiceeffect.h
@@ -58,7 +58,7 @@ private:
 	void updateControls();
 
 	/// Called by voice effect provider when voice effect list is changed.
-	virtual void onVoiceEffectChanged(bool effect_list_updated);
+	virtual void onVoiceEffectChanged(bool effect_list_updated) override;
 
 	void onClickRecord();
 	void onClickPlay();
diff --git a/indra/newview/llpanelgroupinvite.h b/indra/newview/llpanelgroupinvite.h
index c1d2e3defe..d41e8a3097 100644
--- a/indra/newview/llpanelgroupinvite.h
+++ b/indra/newview/llpanelgroupinvite.h
@@ -43,7 +43,7 @@ public:
 	 * this callback is being used to add a user whose fullname isn't been loaded before invoking of addUsers().
 	 */  
 	void addUserCallback(const LLUUID& id, const LLAvatarName& av_name);
-	void clear();
+	void clear() override;
 	void update();
 
 	void setCloseCallback(void (*close_callback)(void*), void* data);
diff --git a/indra/newview/llpanelland.h b/indra/newview/llpanelland.h
index aa2a14d440..9626414f31 100644
--- a/indra/newview/llpanelland.h
+++ b/indra/newview/llpanelland.h
@@ -43,7 +43,7 @@ public:
 	LLPanelLandInfo();
 	virtual ~LLPanelLandInfo();
 
-	void refresh();
+	void refresh() override;
 	static void refreshAll();
 	
 	LLCheckBoxCtrl	*mCheckShowOwners;
diff --git a/indra/newview/llpanelmarketplaceinbox.h b/indra/newview/llpanelmarketplaceinbox.h
index 199d98366f..6d79d8cf55 100644
--- a/indra/newview/llpanelmarketplaceinbox.h
+++ b/indra/newview/llpanelmarketplaceinbox.h
@@ -68,7 +68,7 @@ private:
 
 	void onSelectionChange();
 
-	void onFocusReceived();
+	void onFocusReceived() override;
 
 private:
 	LLUICtrl *			mFreshCountCtrl;
diff --git a/indra/newview/llpaneltopinfobar.h b/indra/newview/llpaneltopinfobar.h
index c1c8bad218..e1676b5ad8 100644
--- a/indra/newview/llpaneltopinfobar.h
+++ b/indra/newview/llpaneltopinfobar.h
@@ -37,7 +37,7 @@ class LLParcelChangeObserver;
 
 class LLPanelTopInfoBar : public LLPanel, public LLSingleton<LLPanelTopInfoBar>, private LLDestroyClass<LLPanelTopInfoBar>
 {
-	LLSINGLETON(LLPanelTopInfoBar);
+	LLSINGLETON_C11(LLPanelTopInfoBar);
 	~LLPanelTopInfoBar();
 	LOG_CLASS(LLPanelTopInfoBar);
 
@@ -83,7 +83,7 @@ private:
 	 */
 	void initParcelIcons();
 
-	bool handleRightMouseDown(S32 x, S32 y, MASK mask);
+	bool handleRightMouseDown(S32 x, S32 y, MASK mask) override;
 
 	/**
 	 * Handles clicks on the parcel icons.
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 11a02400cd..a0cef6553a 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -313,10 +313,10 @@ private:
 private:
 	bool				mIsNew;
 	//LLUUID mTransmitID;
-	LLCheckBoxCtrl*		mRunningCheckbox;
+	//LLCheckBoxCtrl*		mRunningCheckbox;
 	BOOL				mAskedForRunningInfo;
 	BOOL				mHaveRunningInfo;
-	LLButton*			mResetButton;
+	//LLButton*			mResetButton;
 	LLPointer<LLViewerInventoryItem> mItem;
 	BOOL				mCloseAfterSave;
 	// need to save both text and script, so need to decide when done
diff --git a/indra/newview/lltransientdockablefloater.h b/indra/newview/lltransientdockablefloater.h
index 4d3bf9fa22..94c0f68de5 100644
--- a/indra/newview/lltransientdockablefloater.h
+++ b/indra/newview/lltransientdockablefloater.h
@@ -47,7 +47,7 @@ public:
 
 	void setVisible(bool visible) override;
 	void setDocked(bool docked, bool pop_on_undock = true) override;
-	virtual LLTransientFloaterMgr::ETransientGroup getGroup() { return LLTransientFloaterMgr::GLOBAL; }
+	virtual LLTransientFloaterMgr::ETransientGroup getGroup() override { return LLTransientFloaterMgr::GLOBAL; }
 };
 
 #endif /* LL_TRANSIENTDOCKABLEFLOATER_H */