summaryrefslogtreecommitdiff
path: root/indra/newview/lltranslate.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-07 18:58:28 -0400
committerOz Linden <oz@lindenlab.com>2011-06-07 18:58:28 -0400
commit68a7c4cb83aca58e6ad9162be9e5022d6f801eac (patch)
treec5c5d400b2a920c3072a48ec853347ea2e07b966 /indra/newview/lltranslate.cpp
parenta98c22e9b80853ddd036a8f0e79f55bc78943a4e (diff)
parent20a48876d0760c28ebbac379cd9da2e5aa2fb85d (diff)
merge changes for vwr-25654
Diffstat (limited to 'indra/newview/lltranslate.cpp')
-rw-r--r--indra/newview/lltranslate.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 2de7db38ed..2f60b6b90b 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -28,6 +28,8 @@
#include "lltranslate.h"
+#include <curl/curl.h>
+
#include "llbufferstream.h"
#include "llui.h"
#include "llversioninfo.h"
@@ -76,7 +78,9 @@ void LLTranslate::translateMessage(LLHTTPClient::ResponderPtr &result, const std
//static
void LLTranslate::getTranslateUrl(std::string &translate_url, const std::string &from_lang, const std::string &to_lang, const std::string &mesg)
{
- std::string escaped_mesg = curl_escape(mesg.c_str(), mesg.size());
+ char * curl_str = curl_escape(mesg.c_str(), mesg.size());
+ std::string const escaped_mesg(curl_str);
+ curl_free(curl_str);
translate_url = m_GoogleURL
+ escaped_mesg + m_GoogleLangSpec