diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-19 10:33:15 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-19 10:33:15 -0500 |
| commit | fde14fa53289d6bad4e3e91930115d7e249f71b8 (patch) | |
| tree | 3ed65f0d6fb14c9bcec7d2b78fb4e6cb11e413cd /indra/newview/llstartup.cpp | |
| parent | fd95de0e79dfea96f9c3073685dc0bad8cfe39e9 (diff) | |
| parent | b2e4486cf2070e33a9aa6f8cec1a08d93565e52b (diff) | |
merge changes for storm-243
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())); |