Merge branch 'project/mac_universal' into callum/viewer-cef-2025-08

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 41e954b7fa..0e754c9561 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -287,7 +287,7 @@ bool LLFilePicker::getOpenFile(ELoadFilter filter, bool blocking)
     success = GetOpenFileName(&mOFN);
     if (success)
     {
-        std::string filename = utf16str_to_utf8str(llutf16string(mFilesW));
+        std::string filename = ll_convert<std::string>(std::wstring(mFilesW));
         mFiles.push_back(filename);
     }
 
@@ -353,7 +353,7 @@ bool LLFilePicker::getMultipleOpenFiles(ELoadFilter filter, bool blocking)
         // lengths.
         if( wcslen(mOFN.lpstrFile) > mOFN.nFileOffset ) /*Flawfinder: ignore*/
         {
-            std::string filename = utf16str_to_utf8str(llutf16string(mFilesW));
+            std::string filename = ll_convert<std::string>(std::wstring(mFilesW));
             mFiles.push_back(filename);
         }
         else
@@ -367,7 +367,7 @@ bool LLFilePicker::getMultipleOpenFiles(ELoadFilter filter, bool blocking)
                     break;
                 if (*tptrw == 0)
                     tptrw++; // shouldn't happen?
-                std::string filename = utf16str_to_utf8str(llutf16string(tptrw));
+                std::string filename = ll_convert<std::string>(std::wstring(tptrw));
                 if (dirname.empty())
                     dirname = filename + "\\";
                 else
@@ -413,7 +413,7 @@ bool LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename,
     mOFN.lpstrFile = mFilesW;
     if (!filename.empty())
     {
-        llutf16string tstring = utf8str_to_utf16str(filename);
+        std::wstring tstring = ll_convert<std::wstring>(filename);
         wcsncpy(mFilesW, tstring.c_str(), FILENAME_BUFFER_SIZE);    }   /*Flawfinder: ignore*/
     else
     {
@@ -595,7 +595,7 @@ bool LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename,
             success = GetSaveFileName(&mOFN);
             if (success)
             {
-                std::string filename = utf16str_to_utf8str(llutf16string(mFilesW));
+                std::string filename = ll_convert<std::string>(std::wstring(mFilesW));
                 mFiles.push_back(filename);
             }
         }