From 756aac1f9ae00d75f58de97e1b1e717fb582fa65 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Thu, 1 Nov 2012 02:04:40 +0100
Subject: [PATCH] Remove AICurlInterface::strerror

---
 indra/llmessage/aicurl.cpp       | 8 --------
 indra/llmessage/aicurl.h         | 5 -----
 indra/llmessage/aicurlthread.cpp | 4 ++--
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index 34b2211c4..dd2aed44c 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -422,17 +422,9 @@ void setCAPath(std::string const& path)
   CertificateAuthority_w->path = path;
 }
 
-// THREAD-SAFE
-std::string strerror(CURLcode errorcode)
-{
-  // libcurl is thread safe, no locking needed.
-  return curl_easy_strerror(errorcode);
-}
-
 } // namespace AICurlInterface
 //==================================================================================
 
-
 //==================================================================================
 // Local implementation.
 //
diff --git a/indra/llmessage/aicurl.h b/indra/llmessage/aicurl.h
index 89642e602..dfd64a80c 100644
--- a/indra/llmessage/aicurl.h
+++ b/indra/llmessage/aicurl.h
@@ -145,11 +145,6 @@ void startCurlThread(U32 CurlConcurrentConnections, bool NoVerifySSLCert);
 // with purpose to stop curl threads, free curl resources and deinitialize curl.
 void cleanupCurl(void);
 
-// Called from indra/llmessage/llurlrequest.cpp to print debug output regarding
-// an error code returned by EasyRequest::getResult.
-// Just returns curl_easy_strerror(errorcode).
-std::string strerror(CURLcode errorcode);
-
 // Called from indra/newview/llfloaterabout.cpp for the About floater, and
 // from newview/llappviewer.cpp in behalf of debug output.
 // Just returns curl_version().
diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index e36792d5b..f6335cc52 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -2089,8 +2089,8 @@ void CurlResponderBuffer::processOutput(AICurlEasyRequest_wat& curl_easy_request
   }
   else
   {
-	responseCode = 499;
-	responseReason = AICurlInterface::strerror(code);
+	responseCode = HTTP_INTERNAL_ERROR;
+	responseReason = curl_easy_strerror(code);
 	curl_easy_request_w->setopt(CURLOPT_FRESH_CONNECT, TRUE);
   }