diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:20:54 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:20:54 -0500 |
commit | 3015e4310564684702d5eb4c9be56c8870561706 (patch) | |
tree | 0be58e77f8d5c11105f9582db2925bc36bbd47ac /indra/newview/llstartup.cpp | |
parent | 1ae76ea43e3ad57ce58e1b432490de531e01dab3 (diff) | |
parent | 5f997751fe4e55ad3c8a62bcfcdd91752f613903 (diff) |
merge changes for storm-484
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 5617eea4c3..0eac7d5e2a 100644 --- 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())); |