diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h index 80bb9a10b4a28bd04dc0694a7e4e75ef475157a2..289eca5009606dad7e26c1eee3d1afc109490177 100644 --- a/indra/llappearance/llwearabletype.h +++ b/indra/llappearance/llwearabletype.h @@ -47,7 +47,7 @@ class LLWearableType : public LLParamSingleton<LLWearableType> LLSINGLETON(LLWearableType, LLTranslationBridge* trans); ~LLWearableType(); friend struct WearableEntry; - void initSingleton(); + void initSingleton() override; public: enum EType { diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 26f849481fa4ec5ecd16575601aad95f7111cf43..bc1d555311dfdc32a58c5ac6c5dbe458427eeb3f 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -146,13 +146,13 @@ LLUI::LLUI(const settings_map_t& settings, LLImageProviderInterface* image_provider, LLUIAudioCallback audio_callback, LLUIAudioCallback deferred_audio_callback) -: mSettingGroups(settings), -mAudioCallback(audio_callback), -mDeferredAudioCallback(deferred_audio_callback), -mWindow(NULL), // set later in startup -mRootView(NULL), -mDirty(FALSE), -mHelpImpl(NULL) +: mDirty(FALSE), + mSettingGroups(settings), + mAudioCallback(audio_callback), + mDeferredAudioCallback(deferred_audio_callback), + mWindow(NULL), // set later in startup + mRootView(NULL), + mHelpImpl(NULL) { LLRender2D::initParamSingleton(image_provider); diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h index ad006f9bfe8142cecc9c3fb64430678e3b1982cb..268dad98c471c1e79f6072ed07e28516efae6e4e 100644 --- a/indra/newview/llchannelmanager.h +++ b/indra/newview/llchannelmanager.h @@ -43,7 +43,7 @@ class LLChannelManager : public LLSingleton<LLChannelManager> LLSINGLETON(LLChannelManager); virtual ~LLChannelManager(); - void cleanupSingleton(); + void cleanupSingleton() override; public: diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h index e7f907f38e073ab8478a72acf50a9ee79affe98b..75739ef152f6de567e77697be42bb70b69227025 100644 --- a/indra/newview/llfeaturemanager.h +++ b/indra/newview/llfeaturemanager.h @@ -101,7 +101,7 @@ class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManag ~LLFeatureManager() {cleanupFeatureTables();} // initialize this by loading feature table and gpu table - void initSingleton(); + void initSingleton() final override; public: diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index e70deedeedb60709e18a7e736f85dd92b40d533f..48edf42201aab3d854c99260d70fd25ec640d211 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -510,7 +510,7 @@ public: static void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction, bool ended_by_agent); private: - void initSingleton(); + void initSingleton() override; void onVoiceChannelChangedInt(const LLUUID &session_id); void onVoiceChannelStateChangedInt(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction, bool ended_by_agent); diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 20d4d19109ea9f5303f837b2ce97fa745f23c001..eb9fa37269c3735afd86c50f99b89399b530eccd 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -74,7 +74,7 @@ class LLViewerMedia: public LLSingleton<LLViewerMedia> { LLSINGLETON(LLViewerMedia); ~LLViewerMedia(); - void initSingleton(); + void initSingleton() override; LOG_CLASS(LLViewerMedia); public: diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 6ab90070535ed836df9ae48e4c70ca16c7fffcd3..a6052d8277cd2ead671624be7e218efc5dddab75 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -2621,4 +2621,5 @@ void LLViewerParcelMgr::onTeleportDone() { mTeleportDoneSignal(); } -// [/SL:KB] \ No newline at end of file +// [/SL:KB] +