From 29bbaef4aac059ca26c35a46f70e655e58f963bf Mon Sep 17 00:00:00 2001
From: Monroe Linden <monroe@lindenlab.com>
Date: Tue, 17 Aug 2010 17:03:23 -0700
Subject: [PATCH] Fixed a couple of compile errors.
---
indra/integration_tests/llui_libtest/llui_libtest.cpp | 8 ++++----
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 abd8f7dbdec..c981ba23d79 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 038579c0bdb..e9a9203a961 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;
}
--
GitLab