diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-01-28 17:26:45 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-01-28 17:26:45 -0700 |
| commit | 2a6b48c9b0c813c5e4ff8ac176fdf4e6c9466c22 (patch) | |
| tree | 7f608467b3608127049ddc78d5045da032777cb4 /indra/newview/llviewerfloaterreg.cpp | |
| parent | 3e44cb06df22dd1b684dc8574c3b44d0851527bc (diff) | |
| parent | 2998552f3d7447da316afdd1713595528596a0c5 (diff) | |
DRTVWR-440, merge in latest from 6.3.7 release
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index f9b6b20205..c608c589a5 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -66,6 +66,7 @@ #include "llfloaterevent.h" #include "llfloaterfixedenvironment.h" #include "llfloaterfonttest.h" +#include "llfloaterforgetuser.h" #include "llfloatergesture.h" #include "llfloatergodtools.h" #include "llfloatergridstatus.h" @@ -235,6 +236,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("experience_search", "floater_experience_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterExperiencePicker>); LLFloaterReg::add("font_test", "floater_font_test.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFontTest>); + LLFloaterReg::add("forget_username", "floater_forget_user.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterForgetUser>); LLFloaterReg::add("gestures", "floater_gesture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGesture>); LLFloaterReg::add("god_tools", "floater_god_tools.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGodTools>); |