diff options
| -rw-r--r-- | indra/integration_tests/llui_libtest/llui_libtest.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llfirstuse.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp index abd8f7dbde..c981ba23d7 100644 --- a/indra/integration_tests/llui_libtest/llui_libtest.cpp +++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp @@ -191,10 +191,10 @@ void export_test_floaters() // Build a floater and output new attributes LLXMLNodePtr output_node = new LLXMLNode(); LLFloater* floater = new LLFloater(LLSD()); - LLUICtrlFactory::getInstance()->buildFloater(floater, - filename, - // FALSE, // don't open floater - output_node); + LLFloater::buildFloater(floater, + filename, + // FALSE, // don't open floater + output_node); std::string out_filename = xui_dir + filename; std::string::size_type extension_pos = out_filename.rfind(".xml"); out_filename.resize(extension_pos); diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp index 038579c0bd..e9a9203a96 100644 --- a/indra/newview/llfirstuse.cpp +++ b/indra/newview/llfirstuse.cpp @@ -157,7 +157,7 @@ void LLFirstUse::init() static bool initialized = false; if (!initialized) { - LLNotifications::instance().getChannel("Hints")->connectChanged(processNotification); + LLNotifications::instance().getChannel("Hints")->connectChanged(&processNotification); } initialized = true; } |