summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2009-07-24 15:08:16 -0700
committerMark Palange (Mani) <palange@lindenlab.com>2009-07-24 15:08:16 -0700
commit9538328d5f7cf0f0be5dd77b8e27032e09104fff (patch)
tree7592050ae6c8854284f5961558249985e3abec82 /indra/newview/llstartup.cpp
parentdb7f15df68cda2850c3d8a7ffcc59fc136de6f95 (diff)
Adding LLLoginInstance unit test.
- Added LLNotificationsInterface class. - Removed LLLoginInstance use of LLNotifications EventAPI
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index dac6f8423a..eb585f8fe3 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -966,6 +966,7 @@ bool idle_startup()
// Setting initial values...
LLLoginInstance* login = LLLoginInstance::getInstance();
+ login->setNotificationsInterface(LLNotifications::getInstance());
if(gNoRender)
{
// HACK, skip optional updates if you're running drones
@@ -975,7 +976,7 @@ bool idle_startup()
login->setUserInteraction(show_connect_box);
login->setSerialNumber(LLAppViewer::instance()->getSerialNumber());
login->setLastExecEvent(gLastExecEvent);
- login->setUpdaterLauncher(boost::bind(LLAppViewer::launchUpdater, LLAppViewer::instance()));
+ login->setUpdaterLauncher(boost::bind(&LLAppViewer::launchUpdater, LLAppViewer::instance()));
// This call to LLLoginInstance::connect() starts the
// authentication process.