diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:20:18 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:20:18 -0500 |
| commit | 5f997751fe4e55ad3c8a62bcfcdd91752f613903 (patch) | |
| tree | b40caf3240af0fb9f071022c6c17eb66e9a239a3 /indra/newview/llstartup.cpp | |
| parent | 7461f1ca2be2851b76ded50d2eb9c0fcc46cfd5f (diff) | |
| parent | 4f3953763de478b15ec6adc5c468b19a0e13bfe8 (diff) | |
merge changes for storm-383
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())); |