diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-05 20:40:17 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-05 20:40:17 +0100 |
| commit | 5b4eb9fb93af87cbbe163ad6f87d98362a963389 (patch) | |
| tree | 24be6ba7b69bdea9706349ee0a608a4ab977513f /indra/newview/llfloaterfixedenvironment.cpp | |
| parent | b6b9094d26933c41cc917901fcf4847275ff4ca5 (diff) | |
Back out change to fix pointer casts on OS X.
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.cpp')
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp index ad6935ada4..e7b8481caa 100644 --- a/indra/newview/llfloaterfixedenvironment.cpp +++ b/indra/newview/llfloaterfixedenvironment.cpp @@ -285,9 +285,6 @@ void LLFloaterFixedEnvironment::doApplyUpdateInventory() void LLFloaterFixedEnvironment::doApplyEnvironment(const std::string &where) { - LLSettingsSky::ptr_t psky = std::dynamic_pointer_cast<LLSettingsSky>(mSettings); - LLSettingsWater::ptr_t pwater = std::dynamic_pointer_cast<LLSettingsWater>(mSettings); - if (where == ACTION_APPLY_LOCAL) { LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, mSettings); @@ -306,16 +303,16 @@ void LLFloaterFixedEnvironment::doApplyEnvironment(const std::string &where) return; if (mSettings->getSettingType() == "sky") - LLEnvironment::instance().updateParcel(parcel->getLocalID(), psky, -1, -1); + LLEnvironment::instance().updateParcel(parcel->getLocalID(), std::static_pointer_cast<LLSettingsSky>(mSettings), -1, -1); else if (mSettings->getSettingType() == "water") - LLEnvironment::instance().updateParcel(parcel->getLocalID(), pwater, -1, -1); + LLEnvironment::instance().updateParcel(parcel->getLocalID(), std::static_pointer_cast<LLSettingsWater>(mSettings), -1, -1); } else if (where == ACTION_APPLY_REGION) { if (mSettings->getSettingType() == "sky") - LLEnvironment::instance().updateRegion(psky, -1, -1); + LLEnvironment::instance().updateRegion(std::static_pointer_cast<LLSettingsSky>(mSettings), -1, -1); else if (mSettings->getSettingType() == "water") - LLEnvironment::instance().updateRegion(pwater, -1, -1); + LLEnvironment::instance().updateRegion(std::static_pointer_cast<LLSettingsWater>(mSettings), -1, -1); } else { |