diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-26 16:45:20 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-26 16:45:20 +0000 |
| commit | 2c25b7dcc37adacb51d30bbfc741ec0690156f5e (patch) | |
| tree | 16adc0260f7fd7b0a4e0f3abe99e57d632e42c27 /indra/newview/llpanelenvironment.h | |
| parent | 405f5c879c44f32635dcb94de2c7dfb9e4a8673a (diff) | |
| parent | 41a6504c5e121f4ee35f06adc297485d21f4d14d (diff) | |
Merged in andreykproductengine/maint-eep2 (pull request #115)
SL-983 EEP - When selecting a new parcel with the day editor open follow in editor
Diffstat (limited to 'indra/newview/llpanelenvironment.h')
| -rw-r--r-- | indra/newview/llpanelenvironment.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelenvironment.h b/indra/newview/llpanelenvironment.h index 93fe186d6f..9bc0b9df9c 100644 --- a/indra/newview/llpanelenvironment.h +++ b/indra/newview/llpanelenvironment.h @@ -132,7 +132,7 @@ protected: LLFloaterSettingsPicker * getSettingsPicker(bool create = true); LLFloaterEditExtDayCycle * getEditFloater(bool create = true); - void updateEditFloater(const LLEnvironment::EnvironmentInfo::ptr_t &nextenv); + void updateEditFloater(const LLEnvironment::EnvironmentInfo::ptr_t &nextenv, bool enable); void setCrossRegion(bool val) { mCrossRegion = val; } void setNoSelection(bool val) { mNoSelection = val; } |