From 47abd559082f6023dcdfadd2ec740195b1d07990 Mon Sep 17 00:00:00 2001 From: Martin Reddy Date: Wed, 23 Sep 2009 13:57:06 +0000 Subject: 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. --- indra/llui/llurlaction.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llui/llurlaction.cpp') diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp index 7721d0e502..3b689b93c0 100644 --- a/indra/llui/llurlaction.cpp +++ b/indra/llui/llurlaction.cpp @@ -112,7 +112,7 @@ void LLUrlAction::clickAction(std::string url) void LLUrlAction::teleportToLocation(std::string url) { LLUrlMatch match; - if (LLUrlRegistry::instance().findUrl(utf8str_to_wstring(url), match)) + if (LLUrlRegistry::instance().findUrl(url, match)) { if (! match.getLocation().empty()) { @@ -129,7 +129,7 @@ void LLUrlAction::copyURLToClipboard(std::string url) void LLUrlAction::copyLabelToClipboard(std::string url) { LLUrlMatch match; - if (LLUrlRegistry::instance().findUrl(utf8str_to_wstring(url), match)) + if (LLUrlRegistry::instance().findUrl(url, match)) { LLView::getWindow()->copyTextToClipboard(utf8str_to_wstring(match.getLabel())); } -- cgit v1.2.3