diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-09-22 22:12:54 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-09-22 22:12:54 +0000 |
| commit | d65c7b0f90acfbc88e94000a92703aad7413139e (patch) | |
| tree | dba5589ca447e0fed570a674b6f85574cacdab6e /indra/llui | |
| parent | 696b71938c36b4f5de4de47927a565c8b6bb404c (diff) | |
svn merge -c-134040 .
back-out my last commit - it fixed the build test, but the build still fails; I'll leave it alone...
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index e7af64187c..89a80f1e73 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -50,7 +50,7 @@ namespace tut std::string url = ""; boost::wcmatch result; LLWString wtext = utf8str_to_wstring(text); - const wchar_t *wctext = (const wchar_t *)(wtext.c_str()); + const wchar_t *wctext = wtext.c_str(); bool found = boost::regex_search(wctext, result, regex); if (found) { |