diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-17 12:35:42 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-17 12:35:42 -0700 |
| commit | 1716129fd23ff35e030808406af1a8f796dc4b01 (patch) | |
| tree | 6b4c71557920032781b9ae6cf19b89acf15f89c3 /indra/newview/llpanelenvironment.h | |
| parent | 7f25bef9c4bd5bf277331040711f13eb69b9c6d1 (diff) | |
MAINT-8826, MAINT-8990, MAINT-9002, MAINT-7703: Rework for environment pannels in Region/Estate and Parcel. Enable/disable by permission. Edit the correct environment. Dirty flags for changes. Estate owner disallow switch.
Diffstat (limited to 'indra/newview/llpanelenvironment.h')
| -rw-r--r-- | indra/newview/llpanelenvironment.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llpanelenvironment.h b/indra/newview/llpanelenvironment.h index 9a7ce289f0..2fcfb725a1 100644 --- a/indra/newview/llpanelenvironment.h +++ b/indra/newview/llpanelenvironment.h @@ -105,11 +105,9 @@ protected: virtual void doApply(); void onPickerCommited(LLUUID asset_id); - void onEditiCommited(LLSettingsDay::ptr_t newday); + void onEditCommited(LLSettingsDay::ptr_t newday); void onPickerAssetDownloaded(LLSettingsBase::ptr_t settings); - void handleEnvironmentReceived(S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo); - - virtual void doEditCommited(LLSettingsDay::ptr_t &newday); + void onEnvironmentReceived(S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo); void refreshFromSource(); |