summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-02-04 21:12:25 -0800
committerTofu Buzzard <no-email>2011-02-04 21:12:25 -0800
commit3803d78c51a35a868b23d159710c53f2e8ea1dc3 (patch)
tree31508cb85ce2a067dfef4fca7648702bb54afe42 /indra/llmessage
parent84645f5b5959f231680faf0b4c3672b1f74f8643 (diff)
parent36feb9d5a467453763c1f4b41b1779ea711c410f (diff)
merge
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llcurl.cpp18
1 files changed, 4 insertions, 14 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 6473b23e80..2b9bfff536 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -90,13 +90,8 @@ void check_curl_code(CURLcode code)
if (code != CURLE_OK)
{
// linux appears to throw a curl error once per session for a bad initialization
- // at a pretty random time (when enabling cookies). Making curl errors non-asserts
- // for non-windows platforms for now. - Nyx
- #if LL_WINDOWS
- llerrs << "curl error detected: " << curl_easy_strerror(code) << llendl;
- #else
- llinfos << "curl error detected: " << curl_easy_strerror(code) << llendl;
- #endif
+ // at a pretty random time (when enabling cookies).
+ llinfos << "curl error detected: " << curl_easy_strerror(code) << llendl;
}
}
@@ -105,13 +100,8 @@ void check_curl_multi_code(CURLMcode code)
if (code != CURLM_OK)
{
// linux appears to throw a curl error once per session for a bad initialization
- // at a pretty random time (when enabling cookies). Making curl errors non-asserts
- // for non-windows platforms for now. - Nyx
- #if LL_WINDOWS
- llerrs << "curl multi error detected: " << curl_multi_strerror(code) << llendl;
- #else
- llinfos << "curl multi error detected: " << curl_multi_strerror(code) << llendl;
- #endif
+ // at a pretty random time (when enabling cookies).
+ llinfos << "curl multi error detected: " << curl_multi_strerror(code) << llendl;
}
}