diff options
| author | Jacek Antonelli | 2009-09-27 16:32:32 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-27 16:32:32 -0500 |
| commit | 35e3870b5c9e38fdab96ca857a256be6d8ab024a (patch) | |
| tree | 02364fd85552dafbc2503e2c188b4c71e245e14f /linden/indra/newview/llappviewerwin32.cpp | |
| parent | Re-enabled "allow first life" userauth stuff. (diff) | |
| parent | Changes to make the grid manager compile on Windows (diff) | |
| download | meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.zip meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.tar.gz meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.tar.bz2 meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Diffstat (limited to 'linden/indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | linden/indra/newview/llappviewerwin32.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp index b68cad6..110364d 100644 --- a/linden/indra/newview/llappviewerwin32.cpp +++ b/linden/indra/newview/llappviewerwin32.cpp | |||
| @@ -227,13 +227,13 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, | |||
| 227 | viewer_app_ptr = NULL; | 227 | viewer_app_ptr = NULL; |
| 228 | 228 | ||
| 229 | //start updater | 229 | //start updater |
| 230 | if(LLAppViewer::sUpdaterInfo) | 230 | /*if(LLAppViewer::sUpdaterInfo) |
| 231 | { | 231 | { |
| 232 | _spawnl(_P_NOWAIT, LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mParams.str().c_str(), NULL); | 232 | _spawnl(_P_NOWAIT, LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mParams.str().c_str(), NULL); |
| 233 | 233 | ||
| 234 | delete LLAppViewer::sUpdaterInfo ; | 234 | delete LLAppViewer::sUpdaterInfo ; |
| 235 | LLAppViewer::sUpdaterInfo = NULL ; | 235 | LLAppViewer::sUpdaterInfo = NULL ; |
| 236 | } | 236 | }*/ |
| 237 | 237 | ||
| 238 | return 0; | 238 | return 0; |
| 239 | } | 239 | } |