diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:21:51 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:21:51 -0500 |
| commit | a426a4b65b4914c2469a0db1dbde4051b59c289b (patch) | |
| tree | 4e801959d76b3acf2cb6d84bd07c65757ee6a50e /indra/newview/llstartup.cpp | |
| parent | 8864a1b4db54b1ae5b335dec6372ee763b05ece9 (diff) | |
| parent | 3015e4310564684702d5eb4c9be56c8870561706 (diff) | |
merge changes for storm-834
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())); |