diff options
author | Graham Linden <graham@lindenlab.com> | 2018-09-10 23:22:42 +0100 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-09-10 23:22:42 +0100 |
commit | 48ec44c2faac816615a4709b0e71e2a0a88e9885 (patch) | |
tree | 2964a04a7fa075890a28bcfd64ea7bb30772cdea /indra/newview/llpanelenvironment.h | |
parent | 555dfdc6ef0dab37bc4eaf6ae0b00a857f0609da (diff) | |
parent | 6246c8077e5ee81321cff52250d3b99eab81cd57 (diff) |
Merge
Diffstat (limited to 'indra/newview/llpanelenvironment.h')
-rw-r--r-- | indra/newview/llpanelenvironment.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelenvironment.h b/indra/newview/llpanelenvironment.h index b867a7b61d..a8a1f018cf 100644 --- a/indra/newview/llpanelenvironment.h +++ b/indra/newview/llpanelenvironment.h @@ -121,6 +121,7 @@ protected: LLFloaterSettingsPicker * getSettingsPicker(); LLFloaterEditExtDayCycle * getEditFloater(bool create = true); + void updateEditFloater(const LLEnvironment::EnvironmentInfo::ptr_t &nextenv); LLEnvironment::EnvironmentInfo::ptr_t mCurrentEnvironment; S32 mCurrentParcelId; |