diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-12-15 14:37:18 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-12-15 14:37:18 -0700 |
commit | cf35d27dfb86a8a8d8223bc344f35984efaa7b98 (patch) | |
tree | 883758ee1282e0936343ec27d80d25329aae9242 /indra/newview/llviewerfloaterreg.cpp | |
parent | 199775b7ac214cfc3492c343c3f6046effcde7ed (diff) | |
parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) |
DRTVWR-546 merge up to 6.5.2
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 98b76328de..dd03d6cfdd 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -33,6 +33,7 @@ #include "llcommandhandler.h" #include "llcompilequeue.h" #include "llfasttimerview.h" +#include "llfloater360capture.h" #include "llfloaterabout.h" #include "llfloateraddpaymentmethod.h" #include "llfloaterauction.h" @@ -199,6 +200,7 @@ void LLViewerFloaterReg::registerFloaters() // *NOTE: Please keep these alphabetized for easier merges LLFloaterAboutUtil::registerFloater(); + LLFloaterReg::add("360capture", "floater_360capture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloater360Capture>); LLFloaterReg::add("block_timers", "floater_fast_timers.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFastTimerView>); LLFloaterReg::add("about_land", "floater_about_land.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLand>); LLFloaterReg::add("add_payment_method", "floater_add_payment_method.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAddPaymentMethod>); |