diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-05 11:19:22 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-05 11:19:22 -0700 |
| commit | 610a793aa8fb9f918fc25eeab02b7415ac18b33b (patch) | |
| tree | a338e3b4c5f6210c8ad1df9980c2a3f6b2a280bb /indra/newview/llenvironment.cpp | |
| parent | 6ea2847b58164f0ea315f7b2b9c34e663a07e60e (diff) | |
EOL in llsetingssky.cpp and llrender.cpp. const on ptr_t & in llenvironment
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 097b229587..02d79b2bae 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -1134,7 +1134,7 @@ void LLEnvironment::requestRegion() requestParcel(INVALID_PARCEL_ID); } -void LLEnvironment::updateRegion(LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset) +void LLEnvironment::updateRegion(const LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset) { if (!isExtendedEnvironmentEnabled()) { @@ -1157,12 +1157,12 @@ void LLEnvironment::updateRegion(const LLUUID &asset_id, S32 day_length, S32 day updateParcel(INVALID_PARCEL_ID, asset_id, day_length, day_offset); } -void LLEnvironment::updateRegion(LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset) +void LLEnvironment::updateRegion(const LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset) { updateParcel(INVALID_PARCEL_ID, psky, day_length, day_offset); } -void LLEnvironment::updateRegion(LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset) +void LLEnvironment::updateRegion(const LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset) { updateParcel(INVALID_PARCEL_ID, pwater, day_length, day_offset); } @@ -1215,19 +1215,19 @@ void LLEnvironment::onUpdateParcelAssetLoaded(LLUUID asset_id, LLSettingsBase::p updateParcel(parcel_id, pday, day_length, day_offset); } -void LLEnvironment::updateParcel(S32 parcel_id, LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset) +void LLEnvironment::updateParcel(S32 parcel_id, const LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset) { LLSettingsDay::ptr_t pday = createDayCycleFromEnvironment((parcel_id == INVALID_PARCEL_ID) ? ENV_REGION : ENV_PARCEL, psky); updateParcel(parcel_id, pday, day_length, day_offset); } -void LLEnvironment::updateParcel(S32 parcel_id, LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset) +void LLEnvironment::updateParcel(S32 parcel_id, const LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset) { LLSettingsDay::ptr_t pday = createDayCycleFromEnvironment((parcel_id == INVALID_PARCEL_ID) ? ENV_REGION : ENV_PARCEL, pwater); updateParcel(parcel_id, pday, day_length, day_offset); } -void LLEnvironment::updateParcel(S32 parcel_id, LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset) +void LLEnvironment::updateParcel(S32 parcel_id, const LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset) { std::string coroname = LLCoros::instance().launch("LLEnvironment::coroUpdateEnvironment", |