diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
| commit | f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 (patch) | |
| tree | db55a74f8d18b3c366608a537e2a32f6d089d56f /indra/win_updater/updater.cpp | |
| parent | 680667d4bdca7e2a6df15cd6f16f34c12c97da8e (diff) | |
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
Diffstat (limited to 'indra/win_updater/updater.cpp')
| -rw-r--r-- | indra/win_updater/updater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/win_updater/updater.cpp b/indra/win_updater/updater.cpp index c5207f0082..536553a4ed 100644 --- a/indra/win_updater/updater.cpp +++ b/indra/win_updater/updater.cpp @@ -147,7 +147,7 @@ int WINAPI get_url_into_file(WCHAR *uri, char *path, int *cancelled) fflush(logfile); } #endif - + #if _DEBUG fprintf(logfile,"Reading Data, bytes_read = %d\n",bytes_read); fflush(logfile); |