diff options
author | James Cook <james@lindenlab.com> | 2009-12-01 08:51:32 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-01 08:51:32 -0800 |
commit | 5e11affddb1b8816f57f9314381486c00033e080 (patch) | |
tree | b21e2486be2daaa9b249588ce7d88f0f9f472814 /indra/newview/llviewerfloaterreg.cpp | |
parent | 677938e6531209ca9ccd29146454af67f1c743c7 (diff) | |
parent | bf34e572e7acd0f80d103318b76b4abe32c802d3 (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>); |