diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-05 19:22:31 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-05 19:22:31 +0100 |
| commit | 6b7f624a4b7dd11e03cd9b6ed96d61881e121a37 (patch) | |
| tree | 5216d0ad2ce175876a23487842aa6204c85ed41a /indra/newview/llenvironment.h | |
| parent | 197fbaa7f6b4e7c6edc1d8be3c84146d7fb456cc (diff) | |
| parent | 610a793aa8fb9f918fc25eeab02b7415ac18b33b (diff) | |
Merge
Diffstat (limited to 'indra/newview/llenvironment.h')
| -rw-r--r-- | indra/newview/llenvironment.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h index 66950b0625..8202564ce7 100644 --- a/indra/newview/llenvironment.h +++ b/indra/newview/llenvironment.h @@ -239,15 +239,15 @@ public: void requestRegion(); void updateRegion(const LLUUID &asset_id, S32 day_length, S32 day_offset); - void updateRegion(LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset); - void updateRegion(LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset); - void updateRegion(LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset); + void updateRegion(const LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset); + void updateRegion(const LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset); + void updateRegion(const LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset); void resetRegion(); void requestParcel(S32 parcel_id); void updateParcel(S32 parcel_id, const LLUUID &asset_id, S32 day_length, S32 day_offset); - void updateParcel(S32 parcel_id, LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset); - void updateParcel(S32 parcel_id, LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset); - void updateParcel(S32 parcel_id, LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset); + void updateParcel(S32 parcel_id, const LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset); + void updateParcel(S32 parcel_id, const LLSettingsSky::ptr_t &psky, S32 day_length, S32 day_offset); + void updateParcel(S32 parcel_id, const LLSettingsWater::ptr_t &pwater, S32 day_length, S32 day_offset); void resetParcel(S32 parcel_id); void selectAgentEnvironment(); |