Merge branch 'release/2025.07' into project/lua_editor

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp
index 387982dfc2..ff85b2cb14 100644
--- a/indra/llwindow/lldxhardware.cpp
+++ b/indra/llwindow/lldxhardware.cpp
@@ -312,7 +312,7 @@ std::string get_string(IDxDiagContainer *containerp, const WCHAR *wszPropName)
     WCHAR wszPropValue[256];
     get_wstring(containerp, wszPropName, wszPropValue, 256);
 
-    return utf16str_to_utf8str(wszPropValue);
+    return ll_convert<std::string>(std::wstring(wszPropValue));
 }
 
 LLDXHardware::LLDXHardware()
@@ -440,7 +440,7 @@ LLSD LLDXHardware::getDisplayInfo()
                     // print the value
                     // windows doesn't guarantee to be null terminated
                     release_version[RV_SIZE - 1] = NULL;
-                    ret["DriverVersion"] = utf16str_to_utf8str(release_version);
+                    ret["DriverVersion"] = ll_convert<std::string>(std::wstring(release_version));
 
                 }
                 RegCloseKey(hKey);