diff options
author | skolb <none@none> | 2009-12-01 13:34:16 -0800 |
---|---|---|
committer | skolb <none@none> | 2009-12-01 13:34:16 -0800 |
commit | 0ab6d36094cc52eea063f6d3b05262c111857f29 (patch) | |
tree | 95840e0bf49f744520649b030d4bd65b99275bcf /indra/newview/llviewerfloaterreg.cpp | |
parent | 6dd3f54924b57224298f6d76c766b403d165783f (diff) | |
parent | 6a888b653a1ee5ed0eeedd8994ff59652f2913aa (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
-rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 1a8edb1f6a..b5454e7298 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -225,7 +225,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("telehubs", "floater_telehub.xml",&LLFloaterReg::build<LLFloaterTelehub>); LLFloaterReg::add("test_inspectors", "floater_test_inspectors.xml", &LLFloaterReg::build<LLFloaterTestInspectors>); - LLFloaterReg::add("test_list_view", "floater_test_list_view.xml",&LLFloaterReg::build<LLFloaterTestListView>); + //LLFloaterReg::add("test_list_view", "floater_test_list_view.xml",&LLFloaterReg::build<LLFloaterTestListView>); LLFloaterReg::add("test_widgets", "floater_test_widgets.xml", &LLFloaterReg::build<LLFloater>); LLFloaterReg::add("top_objects", "floater_top_objects.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTopObjects>); |