summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-01-21 10:36:29 -0500
committerLoren Shih <seraph@lindenlab.com>2011-01-21 10:36:29 -0500
commit38f4bad925214d848eccd2b5e32123afeb68984d (patch)
treea1a21acac904ebfc5e80db226ab587af2d6558f7 /indra/newview/llstartup.cpp
parenteac9c45cdad9c96e621f5c84ce51062f40c09511 (diff)
parentbb3be2c07f492577254ae9ace5675eb92d10f061 (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rwxr-xr-xindra/newview/llstartup.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 029a48480f..c6efaf4afe 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -981,7 +981,6 @@ bool idle_startup()
login->setSkipOptionalUpdate(true);
}
- login->setUserInteraction(show_connect_box);
login->setSerialNumber(LLAppViewer::instance()->getSerialNumber());
login->setLastExecEvent(gLastExecEvent);
login->setUpdaterLauncher(boost::bind(&LLAppViewer::launchUpdater, LLAppViewer::instance()));