Commits

Scott Lawrence committed df48019 Merge

merge changes for vwr-25654

  • Participants
  • Parent commits 31f1fba, 8e2d938

Comments (0)

Files changed (2)

doc/contributions.txt

 	VWR-13996
 	VWR-14426
 	VWR-24247
+	VWR-25654
 	VWR-24251
 	VWR-24252
 	VWR-24254
 	STORM-1182
 	VWR-233
 	VWR-20583
+	VWR-25654
 	VWR-20891
 	VWR-23455
 	VWR-24487

indra/newview/lltranslate.cpp

 
 #include "lltranslate.h"
 
+#include <curl/curl.h>
+
 #include "llbufferstream.h"
 #include "llui.h"
 #include "llversioninfo.h"
 //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