Merge

6 files changed, 14 insertions, 14 deletions

diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index b677eb36df..1b3b5d2576 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -284,7 +284,7 @@ bool LLSettingsBase::validate()
 
     if (!mSettings.has(SETTING_TYPE))
     {
-        mSettings[SETTING_TYPE] = getSettingType();
+        mSettings[SETTING_TYPE] = getSettingsType();
     }
 
     LLSD result = LLSettingsBase::settingValidation(mSettings, validations);
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index 4ebec4a99d..5e40d185a1 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -75,9 +75,9 @@ public:
     virtual ~LLSettingsBase() { };
 
     //---------------------------------------------------------------------
-    virtual std::string getSettingType() const = 0;
+    virtual std::string getSettingsType() const = 0;
 
-    virtual LLSettingsType::type_e getSettingTypeValue() const = 0;
+    virtual LLSettingsType::type_e getSettingsTypeValue() const = 0;
 
     //---------------------------------------------------------------------
     // Settings status 
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp
index 807d8218a1..54cf5302fa 100644
--- a/indra/llinventory/llsettingsdaycycle.cpp
+++ b/indra/llinventory/llsettingsdaycycle.cpp
@@ -145,7 +145,7 @@ LLSD LLSettingsDay::getSettings() const
     if (mSettings.has(SETTING_ID))
         settings[SETTING_ID] = mSettings[SETTING_ID];
 
-    settings[SETTING_TYPE] = getSettingType();
+    settings[SETTING_TYPE] = getSettingsType();
 
     std::map<std::string, LLSettingsBase::ptr_t> in_use;
 
@@ -236,18 +236,18 @@ bool LLSettingsDay::initialize()
                 if (i == TRACK_WATER)
                 {
                     setting = used[(*it)[SETTING_KEYNAME]];
-                    if (setting && setting->getSettingType() != "water")
+                    if (setting && setting->getSettingsType() != "water")
                     {
-                        LL_WARNS("DAYCYCLE") << "Water track referencing " << setting->getSettingType() << " frame at " << keyframe << "." << LL_ENDL;
+                        LL_WARNS("DAYCYCLE") << "Water track referencing " << setting->getSettingsType() << " frame at " << keyframe << "." << LL_ENDL;
                         setting.reset();
                     }
                 }
                 else
                 {
                     setting = used[(*it)[SETTING_KEYNAME]];
-                    if (setting && setting->getSettingType() != "sky")
+                    if (setting && setting->getSettingsType() != "sky")
                     {
-                        LL_WARNS("DAYCYCLE") << "Sky track #" << i << " referencing " << setting->getSettingType() << " frame at " << keyframe << "." << LL_ENDL;
+                        LL_WARNS("DAYCYCLE") << "Sky track #" << i << " referencing " << setting->getSettingsType() << " frame at " << keyframe << "." << LL_ENDL;
                         setting.reset();
                     }
                 }
diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h
index 5aa6e91183..be888f42cc 100644
--- a/indra/llinventory/llsettingsdaycycle.h
+++ b/indra/llinventory/llsettingsdaycycle.h
@@ -78,11 +78,11 @@ public:
 
     virtual ptr_t               buildClone() = 0;
     virtual LLSD                getSettings() const SETTINGS_OVERRIDE;
-    virtual LLSettingsType::type_e  getSettingTypeValue() const SETTINGS_OVERRIDE { return LLSettingsType::ST_DAYCYCLE; }
+    virtual LLSettingsType::type_e  getSettingsTypeValue() const SETTINGS_OVERRIDE { return LLSettingsType::ST_DAYCYCLE; }
 
 
     //---------------------------------------------------------------------
-    virtual std::string         getSettingType() const SETTINGS_OVERRIDE { return std::string("daycycle"); }
+    virtual std::string         getSettingsType() const SETTINGS_OVERRIDE { return std::string("daycycle"); }
 
     // Settings status 
     virtual void                blend(const LLSettingsBase::ptr_t &other, F64 mix) SETTINGS_OVERRIDE;
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index 0cdd064624..c30efe0781 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -97,8 +97,8 @@ public:
     virtual ptr_t   buildClone() = 0;
 
     //---------------------------------------------------------------------
-    virtual std::string getSettingType() const SETTINGS_OVERRIDE { return std::string("sky"); }
-    virtual LLSettingsType::type_e getSettingTypeValue() const SETTINGS_OVERRIDE { return LLSettingsType::ST_SKY; }
+    virtual std::string getSettingsType() const SETTINGS_OVERRIDE { return std::string("sky"); }
+    virtual LLSettingsType::type_e getSettingsTypeValue() const SETTINGS_OVERRIDE { return LLSettingsType::ST_SKY; }
 
     // Settings status 
     virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf) SETTINGS_OVERRIDE;
diff --git a/indra/llinventory/llsettingswater.h b/indra/llinventory/llsettingswater.h
index 92e9869e45..19761f6f07 100644
--- a/indra/llinventory/llsettingswater.h
+++ b/indra/llinventory/llsettingswater.h
@@ -55,8 +55,8 @@ public:
     virtual ptr_t   buildClone() = 0;
 
     //---------------------------------------------------------------------
-    virtual std::string     getSettingType() const SETTINGS_OVERRIDE { return std::string("water"); }
-    virtual LLSettingsType::type_e  getSettingTypeValue() const SETTINGS_OVERRIDE { return LLSettingsType::ST_WATER; }
+    virtual std::string     getSettingsType() const SETTINGS_OVERRIDE { return std::string("water"); }
+    virtual LLSettingsType::type_e  getSettingsTypeValue() const SETTINGS_OVERRIDE { return LLSettingsType::ST_WATER; }
 
     // Settings status 
     virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf) SETTINGS_OVERRIDE;