Some virtual cleanup

indra/newview/llenvironment.cpp

@@ -369,7 +369,7 @@ namespace
             mLastHash(0)
         {}
 
-        virtual ~LLSettingsInjected() {};
+        virtual ~LLSettingsInjected() = default;
 
         typename SETTINGT::ptr_t getSource() const                    { return this->mSource; }
         void setSource(const typename SETTINGT::ptr_t &source)        
@@ -560,7 +560,7 @@ namespace
         };
 
 
-        virtual void updateSettings() override
+        void updateSettings() final
         {
             static LLFrameTimer timer;
 
@@ -862,10 +862,6 @@ void LLEnvironment::cleanupSingleton()
     LLEventPumps::instance().obtain(PUMP_EXPERIENCE).stopListening(LISTENER_NAME);
 }
 
-LLEnvironment::~LLEnvironment()
-{
-}
-
 bool LLEnvironment::canEdit() const
 {
     return true;

indra/newview/llenvironment.h

@@ -114,7 +114,7 @@ class LLEnvironment final : public LLSingleton<LLEnvironment>
     typedef std::array<F32, 4>                                      altitude_list_t;
     typedef std::vector<F32>                                        altitudes_vect_t;
 
-    virtual                     ~LLEnvironment();
+    virtual                     ~LLEnvironment() = default;
 
     bool                        canEdit() const;
     bool                        isExtendedEnvironmentEnabled() const;
@@ -223,8 +223,6 @@ class LLEnvironment final : public LLSingleton<LLEnvironment>
     void                        updateParcel(S32 parcel_id, const LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset, altitudes_vect_t altitudes = altitudes_vect_t(), environment_apply_fn cb = environment_apply_fn());
     void                        resetParcel(S32 parcel_id, environment_apply_fn cb = environment_apply_fn());
 
-    void                        selectAgentEnvironment();
-
     S32                         calculateSkyTrackForAltitude(F64 altitude);
 
     const altitude_list_t &     getRegionAltitudes() const { return mTrackAltitudes; }
@@ -240,7 +238,7 @@ class LLEnvironment final : public LLSingleton<LLEnvironment>
         static const U32                NO_ANIMATE_WATER;
 
                                         DayInstance(EnvSelection_t env);
-        virtual                         ~DayInstance() { };
+        virtual                         ~DayInstance() = default;
 
         virtual ptr_t                   clone() const;
 
@@ -307,7 +305,7 @@ class LLEnvironment final : public LLSingleton<LLEnvironment>
     {
     public:
                                     DayTransition(const LLSettingsSky::ptr_t &skystart, const LLSettingsWater::ptr_t &waterstart, DayInstance::ptr_t &end, LLSettingsDay::Seconds time);
-        virtual                     ~DayTransition() { };
+        virtual                     ~DayTransition() = default;
 
         virtual bool                applyTimeDelta(const LLSettingsBase::Seconds& delta) override;
         virtual void                animate() override;

indra/newview/llsettingsvo.h

@@ -43,7 +43,7 @@ class LLInventoryItem;
 class LLGLSLShader;
 
 //=========================================================================
-class LLSettingsVOBase : public LLSettingsBase
+class LLSettingsVOBase final : public LLSettingsBase
 {
 public:
     typedef std::function<void(LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status, LLExtStat extstat)>  asset_download_fn;
@@ -74,7 +74,7 @@ class LLSettingsVOBase : public LLSettingsBase
         LLTransactionID         mTransId;
     };
 
-    LLSettingsVOBase() {}
+    LLSettingsVOBase() = default;
 
     static void     onInventoryItemCreated(const LLUUID &inventoryId, LLSettingsBase::ptr_t settings, inventory_result_fn callback);
 
@@ -94,7 +94,7 @@ class LLSettingsVOSky : public LLSettingsSky
 
     static ptr_t buildFromLegacyPreset(const std::string &name, const LLSD &oldsettings, LLSD &messages);
     static ptr_t    buildDefaultSky();
-    virtual ptr_t   buildClone() const SETTINGS_OVERRIDE;
+    ptr_t   buildClone() const final;
 
     static ptr_t buildFromLegacyPresetFile(const std::string &name, const std::string &path, LLSD &messages);
 
@@ -102,7 +102,7 @@ class LLSettingsVOSky : public LLSettingsSky
 
     bool isAdvanced() const { return  m_isAdvanced; }
 
-    virtual void updateShader(LLGLSLShader* shader) { applySpecial(shader, true); }
+    void updateShader(LLGLSLShader* shader) { applySpecial(shader, true); }
 
 protected:
     LLSettingsVOSky();
@@ -110,11 +110,11 @@ class LLSettingsVOSky : public LLSettingsSky
     // Interpret new settings in terms of old atmospherics params
     static void convertAtmosphericsToLegacy(LLSD& legacy, LLSD& settings);
 
-    virtual void    updateSettings() override;
+    void    updateSettings() override;
 
-    virtual void    applySpecial(void *, bool) override;
+    void    applySpecial(void *, bool) final;
 
-    virtual const parammapping_t& getParameterMap() const override;
+    const parammapping_t& getParameterMap() const final;
 
     bool m_isAdvanced = false;
     F32 mSceneLightStrength = 3.0f;
@@ -130,21 +130,21 @@ class LLSettingsVOWater : public LLSettingsWater
 
     static ptr_t buildFromLegacyPreset(const std::string &name, const LLSD &oldsettings, LLSD &messages);
     static ptr_t    buildDefaultWater();
-    virtual ptr_t   buildClone() const SETTINGS_OVERRIDE;
+    ptr_t   buildClone() const final;
 
     static ptr_t buildFromLegacyPresetFile(const std::string &name, const std::string &path, LLSD &messages);
 
     static LLSD     convertToLegacy(const ptr_t &);
 
-    virtual void    updateShader(LLGLSLShader* shader) { applySpecial(shader, true); }
+    void    updateShader(LLGLSLShader* shader) { applySpecial(shader, true); }
 
 protected:
     LLSettingsVOWater();
 
-    virtual void    updateSettings() override;
-    virtual void    applySpecial(void *, bool) override;
+    void    updateSettings() override;
+    void    applySpecial(void *, bool) final;
 
-    virtual const parammapping_t& getParameterMap() const override;
+    const parammapping_t& getParameterMap() const final;
 
 
 private: