diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-11-02 12:17:28 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-11-02 12:17:28 -0500 |
| commit | 32cc9a71d0e71bba96555558275a684501493e83 (patch) | |
| tree | b61f7b91ea7b6a0cee649da734413b265ebab6ac /indra/newview/llviewerfloaterreg.cpp | |
| parent | c3f94ab9a1da2c0c5304ff624b54fad6a43506ae (diff) | |
| parent | 734e3fcb21228d07038da952820fa371e3c8af14 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index f5ccc238c0..962e3e2cf0 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -337,6 +337,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("script_colors", "floater_script_ed_prefs.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterScriptEdPrefs>); LLFloaterReg::add("material_editor", "floater_material_editor.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLMaterialEditor>); + LLFloaterReg::add("live_material_editor", "floater_live_material_editor.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLMaterialEditor>); LLFloaterReg::add("telehubs", "floater_telehub.xml",&LLFloaterReg::build<LLFloaterTelehub>); LLFloaterReg::add("test_inspectors", "floater_test_inspectors.xml", &LLFloaterReg::build<LLFloaterTestInspectors>); |