From 179b29252d8bb28e11686a1852c8e8ffcd98ecc0 Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Tue, 11 Feb 2025 05:02:45 -0500
Subject: Rework windows to use zc:wchar_t for better c++ conformance and
 compatibility with modern libraries

---
 indra/newview/llfilepicker.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llfilepicker.cpp')

diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 0afb275d13..0dd2c13bb8 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -285,7 +285,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);
     }
 
@@ -351,7 +351,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
@@ -365,7 +365,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
@@ -411,7 +411,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
     {
@@ -593,7 +593,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);
             }
         }
-- 
cgit v1.2.3