diff options
| author | Martin Reddy <lynx@lindenlab.com> | 2009-09-23 13:57:06 +0000 |
|---|---|---|
| committer | Martin Reddy <lynx@lindenlab.com> | 2009-09-23 13:57:06 +0000 |
| commit | 47abd559082f6023dcdfadd2ec740195b1d07990 (patch) | |
| tree | 244c81063dd56a8095a8fc137d89ad87c0e024c5 /indra/llui/lltextbase.cpp | |
| parent | 658849ee953da606035efba20a6e599ea7e9eb0f (diff) | |
EXT-944 EXT-1026: reverting my previous fix for these crashes.
This didn't work on Windows because wchar_t is 2 bytes on that
platform, not 4 bytes (whereas llwchar is 4 bytes everywhere).
Boost's regex methods need to work on wchar_t, but I believe
that using a UTF-16 string would still be prone to crashing on
Windows as UTF-16 is still a variable-length encoding. Besides,
trying to compile a UTF-16 solution generates weird link errors.
Instead, I'm going to fix this problem a different way. And
I'm starting by reverting the previous attempt. Thanks Win32.
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 325c7a8104..cb60b4fe36 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -429,7 +429,7 @@ LLContextMenu *LLTextBase::createUrlContextMenu(const std::string &in_url) // work out the XUI menu file to use for this url LLUrlMatch match; std::string url = in_url; - if (! LLUrlRegistry::instance().findUrl(utf8str_to_wstring(url), match)) + if (! LLUrlRegistry::instance().findUrl(url, match)) { return NULL; } |