From 6370f3311f8fa4e519302a430f4787ade2993af1 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 10 Oct 2021 06:51:23 -0400
Subject: [PATCH] Fix windows c++20 compilation error
---
indra/newview/llmachineid.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp
index 5dcfbefb90c..8243016b6dd 100644
--- a/indra/newview/llmachineid.cpp
+++ b/indra/newview/llmachineid.cpp
@@ -224,7 +224,7 @@ S32 LLMachineID::init()
pclsObj = NULL;
continue;
}
- LL_INFOS("AppInit") << " Serial Number : " << vtProp.bstrVal << LL_ENDL;
+ LL_INFOS("AppInit") << " Serial Number : " << ll_convert_wide_to_string(vtProp.bstrVal) << LL_ENDL;
// use characters in the returned Serial Number to create a byte array of size len
BSTR serialNumber ( vtProp.bstrVal);
--
GitLab