From 495f62298c78fdc36078a7e7ea3e7012a883a93a Mon Sep 17 00:00:00 2001 From: Karen Lahey Date: Thu, 27 May 2010 15:36:45 -0700 Subject: explicit cast cr:Roxie --- indra/newview/llmachineid.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp index b9a56d1497..53243e9807 100644 --- a/indra/newview/llmachineid.cpp +++ b/indra/newview/llmachineid.cpp @@ -50,10 +50,10 @@ bool static has_static_unique_id = false; S32 LLMachineID::init() { memset(static_unique_id,0,sizeof(static_unique_id)); - size_t len = sizeof(static_unique_id); S32 ret_code = 0; #if LL_WINDOWS # pragma comment(lib, "wbemuuid.lib") + size_t len = sizeof(static_unique_id); // algorithm to detect BIOS serial number found at: // http://msdn.microsoft.com/en-us/library/aa394077%28VS.85%29.aspx @@ -245,7 +245,8 @@ S32 LLMachineID::init() CoUninitialize(); ret_code=0; #else - ret_code = LLUUID::getNodeID(&static_unique_id); + unsigned char * staticPtr = (unsigned char *)(&static_unique_id[0]); + ret_code = LLUUID::getNodeID(staticPtr); #endif has_static_unique_id = true; return ret_code; -- cgit v1.2.3