diff options
Diffstat (limited to 'linden/indra/newview/llappviewermacosx.cpp')
-rw-r--r-- | linden/indra/newview/llappviewermacosx.cpp | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp index d81b6e3..ee4648f 100644 --- a/linden/indra/newview/llappviewermacosx.cpp +++ b/linden/indra/newview/llappviewermacosx.cpp | |||
@@ -300,7 +300,7 @@ static OSStatus CarbonEventHandler(EventHandlerCallRef inHandlerCallRef, | |||
300 | void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze) | 300 | void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze) |
301 | { | 301 | { |
302 | // This used to use fork&exec, but is switched to LSOpenApplication to | 302 | // This used to use fork&exec, but is switched to LSOpenApplication to |
303 | // Make sure the crash reporter launches in front of the SL window. | 303 | // Make sure the crash reporter launches in front of the viewer window. |
304 | 304 | ||
305 | std::string command_str; | 305 | std::string command_str; |
306 | //command_str = "open Second Life.app/Contents/Resources/mac-crash-logger.app"; | 306 | //command_str = "open Second Life.app/Contents/Resources/mac-crash-logger.app"; |
@@ -419,27 +419,7 @@ std::string LLAppViewerMacOSX::generateSerialNumber() | |||
419 | char serial_md5[MD5HEX_STR_SIZE]; // Flawfinder: ignore | 419 | char serial_md5[MD5HEX_STR_SIZE]; // Flawfinder: ignore |
420 | serial_md5[0] = 0; | 420 | serial_md5[0] = 0; |
421 | 421 | ||
422 | // JC: Sample code from http://developer.apple.com/technotes/tn/tn1103.html | 422 | // Don't do anything, serious privacy breach to leak internal identifying numbers out to the 'net. |
423 | CFStringRef serialNumber = NULL; | ||
424 | io_service_t platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault, | ||
425 | IOServiceMatching("IOPlatformExpertDevice")); | ||
426 | if (platformExpert) { | ||
427 | serialNumber = (CFStringRef) IORegistryEntryCreateCFProperty(platformExpert, | ||
428 | CFSTR(kIOPlatformSerialNumberKey), | ||
429 | kCFAllocatorDefault, 0); | ||
430 | IOObjectRelease(platformExpert); | ||
431 | } | ||
432 | |||
433 | if (serialNumber) | ||
434 | { | ||
435 | char buffer[MAX_STRING]; // Flawfinder: ignore | ||
436 | if (CFStringGetCString(serialNumber, buffer, MAX_STRING, kCFStringEncodingASCII)) | ||
437 | { | ||
438 | LLMD5 md5( (unsigned char*)buffer ); | ||
439 | md5.hex_digest(serial_md5); | ||
440 | } | ||
441 | CFRelease(serialNumber); | ||
442 | } | ||
443 | 423 | ||
444 | return serial_md5; | 424 | return serial_md5; |
445 | } | 425 | } |