diff -r 9ff8625cadec doc/contributions.txt --- a/doc/contributions.txt Wed Sep 01 14:41:51 2010 -0700 +++ b/doc/contributions.txt Tue May 17 18:15:41 2011 +0200 @@ -64,6 +64,7 @@ VWR-12691 VWR-13996 VWR-14426 + VWR-25654 SNOW-766 Ales Beaumont VWR-9352 @@ -160,6 +161,7 @@ SNOW-610 SNOW-624 VWR-233 + VWR-25654 WEB-262 Bulli Schumann CT-218 diff -r 9ff8625cadec indra/newview/lltranslate.cpp --- a/indra/newview/lltranslate.cpp Wed Sep 01 14:41:51 2010 -0700 +++ b/indra/newview/lltranslate.cpp Tue May 17 18:15:41 2011 +0200 @@ -34,6 +34,8 @@ #include "lltranslate.h" +#include + #include "llbufferstream.h" #include "llui.h" #include "llversionviewer.h" @@ -82,7 +84,9 @@ //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