diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-11 17:59:19 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-11 17:59:19 +0100 |
| commit | 4fbdfe637049e0a2e93c6fed030e61b32a43ae07 (patch) | |
| tree | e502796c9f39a790f8004edfba5383b1ac7617a2 /indra/newview/llfloaterfixedenvironment.cpp | |
| parent | a0598b12656cdcf22ba95cacd01b5ff36f8f1b26 (diff) | |
| parent | 8365945f8af6e27e7180b40aae79f210f99bb7c8 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.cpp')
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp index e7b8481caa..0c6127c61f 100644 --- a/indra/newview/llfloaterfixedenvironment.cpp +++ b/indra/newview/llfloaterfixedenvironment.cpp @@ -302,16 +302,16 @@ void LLFloaterFixedEnvironment::doApplyEnvironment(const std::string &where) if (!parcel) return; - if (mSettings->getSettingType() == "sky") + if (mSettings->getSettingsType() == "sky") LLEnvironment::instance().updateParcel(parcel->getLocalID(), std::static_pointer_cast<LLSettingsSky>(mSettings), -1, -1); - else if (mSettings->getSettingType() == "water") + else if (mSettings->getSettingsType() == "water") LLEnvironment::instance().updateParcel(parcel->getLocalID(), std::static_pointer_cast<LLSettingsWater>(mSettings), -1, -1); } else if (where == ACTION_APPLY_REGION) { - if (mSettings->getSettingType() == "sky") + if (mSettings->getSettingsType() == "sky") LLEnvironment::instance().updateRegion(std::static_pointer_cast<LLSettingsSky>(mSettings), -1, -1); - else if (mSettings->getSettingType() == "water") + else if (mSettings->getSettingsType() == "water") LLEnvironment::instance().updateRegion(std::static_pointer_cast<LLSettingsWater>(mSettings), -1, -1); } else |