diff --git a/indra/llcommon/llsys_objc.h b/indra/llcommon/llsys_objc.h index 35599a574b7212c9eb00e3be9522283a0a760973..a528f2ceefc2e8386b624c42e1cbe4eabdbc89e7 100644 --- a/indra/llcommon/llsys_objc.h +++ b/indra/llcommon/llsys_objc.h @@ -28,6 +28,6 @@ #define LL_LLSYS_OBJC_H bool LLGetDarwinOSInfo(int &major, int &minor, int &patch); - +const char* LLGetDarwinPreferredLanguage(); #endif // LL_LLSYS_OBJC_H diff --git a/indra/llcommon/llsys_objc.mm b/indra/llcommon/llsys_objc.mm index 1caf12c2d12a2865da425b62b76498e83b2d355c..bfede7839215e6c2cf7a175c7b3db9dbe0a1ddc8 100644 --- a/indra/llcommon/llsys_objc.mm +++ b/indra/llcommon/llsys_objc.mm @@ -35,31 +35,15 @@ static int intAtStringIndex(NSArray *array, int index) bool LLGetDarwinOSInfo(int &major, int &minor, int &patch) { NSOperatingSystemVersion osVersion = [[NSProcessInfo processInfo] operatingSystemVersion]; - major = osVersion.majorVersion; - minor = osVersion.minorVersion; - patch = osVersion.patchVersion; - return true; + major = (int)osVersion.majorVersion; + minor = (int)osVersion.minorVersion; + patch = (int)osVersion.patchVersion; + return true; } const char* LLGetDarwinPreferredLanguage() { NSString* lang = [[NSLocale preferredLanguages] objectAtIndex:0]; const char* ret = [lang cStringUsingEncoding:NSASCIIStringEncoding]; - @"/System/Library/CoreServices/SystemVersion.plist"] objectForKey:@"ProductVersion"]; - NSArray* versions = [versionString componentsSeparatedByString:@"."]; - NSUInteger count = [versions count]; - if (count > 0) - { - major = intAtStringIndex(versions, 0); - if (count > 1) - { - minor = intAtStringIndex(versions, 1); - if (count > 2) - { - patch = intAtStringIndex(versions, 2); - } - } - } - } return ret; }