diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:43:50 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:43:50 -0700 |
| commit | 97da85de0b1e0f8c2fc60c156c31b237b869230a (patch) | |
| tree | 5dd5785e0bc9321c5e340c70ccf8c36993b948da /indra/newview/llviewerfloaterreg.cpp | |
| parent | 8365945f8af6e27e7180b40aae79f210f99bb7c8 (diff) | |
remove legacy environmental edit floater and some lingering transition functions. Change floater environment switch behavior.
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 78c868c6f4..2d1f3510d5 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -59,7 +59,6 @@ #include "llfloaterdestinations.h" #include "llfloatereditdaycycle.h" #include "llfloatereditextdaycycle.h" -#include "llfloaterenvironmentsettings.h" #include "llfloaterexperienceprofile.h" #include "llfloaterexperiences.h" #include "llfloaterexperiencepicker.h" @@ -220,7 +219,6 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("destinations", "floater_destinations.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDestinations>); LLFloaterReg::add("env_post_process", "floater_post_process.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPostProcess>); - LLFloaterReg::add("env_settings", "floater_environment_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEnvironmentSettings>); LLFloaterReg::add("env_edit_day_cycle", "floater_edit_day_cycle.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEditDayCycle>); LLFloaterReg::add("env_fixed_environmentent_water", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentWater>); |