diff options
author | David Seikel | 2011-02-09 01:57:04 +1000 |
---|---|---|
committer | David Seikel | 2011-02-09 01:57:04 +1000 |
commit | 6a87cef1d449e8cdf8ebac53994a9a032792cf92 (patch) | |
tree | c6f129866713b590e2a02e2199f5b6fd8595438e /linden/indra/newview/llstartup.cpp | |
parent | Merge branch 'branding' of github.com:onefang/meta-impy into branding (diff) | |
download | meta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.zip meta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.tar.gz meta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.tar.bz2 meta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.tar.xz |
Change imprudence -> meta-impy, though not the URLs. Probably some will need to be reverted later.
Changed file names to.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index b744961..31647e9 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -2989,7 +2989,7 @@ std::string LLStartUp::loadPasswordFromDisk() | |||
2989 | #if LL_DARWIN | 2989 | #if LL_DARWIN |
2990 | UInt32 passwordLength; | 2990 | UInt32 passwordLength; |
2991 | char *passwordData; | 2991 | char *passwordData; |
2992 | OSStatus stat = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, &passwordLength, (void**)&passwordData, NULL); | 2992 | OSStatus stat = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, &passwordLength, (void**)&passwordData, NULL); |
2993 | if (stat == noErr) | 2993 | if (stat == noErr) |
2994 | { | 2994 | { |
2995 | if (passwordLength == HASHED_LENGTH) | 2995 | if (passwordLength == HASHED_LENGTH) |
@@ -3037,7 +3037,7 @@ void LLStartUp::savePasswordToDisk(const std::string& hashed_password) | |||
3037 | { | 3037 | { |
3038 | #if LL_DARWIN | 3038 | #if LL_DARWIN |
3039 | SecKeychainItemRef keychainItem; | 3039 | SecKeychainItemRef keychainItem; |
3040 | OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, NULL, NULL, &keychainItem); | 3040 | OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, NULL, NULL, &keychainItem); |
3041 | if (status == noErr) | 3041 | if (status == noErr) |
3042 | { | 3042 | { |
3043 | SecKeychainItemModifyAttributesAndData(keychainItem, NULL, hashed_password.length(), hashed_password.c_str()); | 3043 | SecKeychainItemModifyAttributesAndData(keychainItem, NULL, hashed_password.length(), hashed_password.c_str()); |
@@ -3045,7 +3045,7 @@ void LLStartUp::savePasswordToDisk(const std::string& hashed_password) | |||
3045 | } | 3045 | } |
3046 | else | 3046 | else |
3047 | { | 3047 | { |
3048 | SecKeychainAddGenericPassword(NULL, 10, "Imprudence", 0, NULL, hashed_password.length(), hashed_password.c_str(), NULL); | 3048 | SecKeychainAddGenericPassword(NULL, 10, "meta-impy", 0, NULL, hashed_password.length(), hashed_password.c_str(), NULL); |
3049 | } | 3049 | } |
3050 | #else | 3050 | #else |
3051 | std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, | 3051 | std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, |
@@ -3080,7 +3080,7 @@ void LLStartUp::deletePasswordFromDisk() | |||
3080 | { | 3080 | { |
3081 | #if LL_DARWIN | 3081 | #if LL_DARWIN |
3082 | SecKeychainItemRef keychainItem; | 3082 | SecKeychainItemRef keychainItem; |
3083 | OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, NULL, NULL, &keychainItem); | 3083 | OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, NULL, NULL, &keychainItem); |
3084 | if (status == noErr) | 3084 | if (status == noErr) |
3085 | { | 3085 | { |
3086 | SecKeychainItemDelete(keychainItem); | 3086 | SecKeychainItemDelete(keychainItem); |