diff options
| author | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
| commit | c6c7c7c71da48b60557dbc4b653398dd6343b6fc (patch) | |
| tree | 6711858f93cb0353d44568c4531ba8392990cea2 /indra/newview/llappviewerwin32.cpp | |
| parent | 07185d300d7879fc4d8d268210fa2c440efe02f4 (diff) | |
| parent | 83cda57b10e1416f2d104941f862f598653c42cb (diff) | |
Automated merge with tip of viewer64
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index d6039f6d7f..d0093e6951 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -361,17 +361,6 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, delete viewer_app_ptr; viewer_app_ptr = NULL; - //start updater - if(LLAppViewer::sUpdaterInfo) - { - _spawnl(_P_NOWAIT, LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mParams.str().c_str(), NULL); - - delete LLAppViewer::sUpdaterInfo ; - LLAppViewer::sUpdaterInfo = NULL ; - } - - - // (NVAPI) (6) We clean up. This is analogous to doing a free() if (hSession) { |