diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-09-10 15:53:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-10 15:53:59 -0400 |
| commit | 5b97823db6f7cec6569ef893499cf48f4a889e67 (patch) | |
| tree | 79f368f096ba2c72a98627671c713a0a8abf332f /indra/newview/llmachineid.cpp | |
| parent | 175400230869963df7a3f126122ace14456c56cb (diff) | |
| parent | dd1113ba2b62b24378e5b8ecfee0093474527c5a (diff) | |
Merge pull request #4636 from secondlife/project/mac_universal
Apple Silicon Support
Diffstat (limited to 'indra/newview/llmachineid.cpp')
| -rw-r--r-- | indra/newview/llmachineid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp index aa03001389..51c38aba3a 100644 --- a/indra/newview/llmachineid.cpp +++ b/indra/newview/llmachineid.cpp @@ -293,7 +293,7 @@ bool LLWMIMethods::getGenericSerialNumber(const BSTR &select, const LPCWSTR &var if (validate_as_uuid) { std::wstring ws(serialNumber, serial_size); - std::string str = ll_convert_wide_to_string(ws); + std::string str = ll_convert<std::string>(ws); if (!LLUUID::validate(str)) { @@ -315,7 +315,7 @@ bool LLWMIMethods::getGenericSerialNumber(const BSTR &select, const LPCWSTR &var continue; } } - LL_INFOS("AppInit") << " Serial Number : " << vtProp.bstrVal << LL_ENDL; + LL_INFOS("AppInit") << " Serial Number : " << ll_convert_wide_to_string(std::wstring(vtProp.bstrVal, SysStringLen(vtProp.bstrVal))) << LL_ENDL; unsigned int j = 0; |