diff options
| author | David Seikel | 2011-02-20 20:31:57 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-20 20:31:57 +1000 |
| commit | d6666d0776985bada40f19c623b86d82a4113f92 (patch) | |
| tree | eb4d234a313c51b40f6d53d4a59bdc831a7cd0fc /linden/indra/llcrashlogger | |
| parent | Remove catering to LL's probably illegal attempt to block copying of open sou... (diff) | |
| parent | Reduce the logging spam to warnings. Debug was too much. (diff) | |
| download | meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.zip meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.gz meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.bz2 meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.xz | |
Merge branch 'weekly' into branding
Conflicts (solved):
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llappviewerwin32.cpp
Diffstat (limited to 'linden/indra/llcrashlogger')
| -rwxr-xr-x | linden/indra/llcrashlogger/llcrashlogger.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp index 69e0adb..a399a48 100755 --- a/linden/indra/llcrashlogger/llcrashlogger.cpp +++ b/linden/indra/llcrashlogger/llcrashlogger.cpp | |||
| @@ -387,8 +387,7 @@ bool LLCrashLogger::init() | |||
| 387 | return false; | 387 | return false; |
| 388 | } | 388 | } |
| 389 | 389 | ||
| 390 | gServicePump = new LLPumpIO(gAPRPoolp); | 390 | gServicePump = new LLPumpIO; |
| 391 | gServicePump->prime(gAPRPoolp); | ||
| 392 | LLHTTPClient::setPump(*gServicePump); | 391 | LLHTTPClient::setPump(*gServicePump); |
| 393 | 392 | ||
| 394 | //If we've opened the crash logger, assume we can delete the marker file if it exists | 393 | //If we've opened the crash logger, assume we can delete the marker file if it exists |