1 files changed, 11 insertions, 11 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index ec45955..73aa9ba 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -977,8 +977,8 @@ bool idle_startup()
 
                 // create necessary directories
                 // *FIX: these mkdir's should error check
-                gDirUtilp->setLindenUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
-                LLFile::mkdir(gDirUtilp->getLindenUserDir());
+                gDirUtilp->setViewerUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
+                LLFile::mkdir(gDirUtilp->getViewerUserDir());
 
                 // Set PerAccountSettingsFile to the default value.
                 gSavedSettings.setString("PerAccountSettingsFile",
@@ -1254,7 +1254,7 @@ bool idle_startup()
 
                 char hashed_mac_string[MD5HEX_STR_SIZE];                /* Flawfinder: ignore */
                 LLMD5 hashed_mac;
-                hashed_mac.update( gMACAddress, MAC_ADDRESS_BYTES );
+                hashed_mac.update( (const unsigned char*) "012345", MAC_ADDRESS_BYTES );  // Nope, LL ain't getting our MAC, and meta7 does not need it.
                 hashed_mac.finalize();
                 hashed_mac.hex_digest(hashed_mac_string);
 
@@ -2471,7 +2471,7 @@ bool idle_startup()
                         }
                 }
                 // Either we want to show tutorial because this is the first login
-                // to a Linden Help Island or the user quit with the tutorial
+                // to a grid Help Island or the user quit with the tutorial
                 // visible.  JC
                 if (show_hud
                         || gSavedSettings.getBOOL("ShowTutorial"))
@@ -3082,7 +3082,7 @@ std::string LLStartUp::loadPasswordFromDisk()
 #if LL_DARWIN
                 UInt32 passwordLength;
                 char *passwordData;
-                OSStatus stat = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, &passwordLength, (void**)&passwordData, NULL);
+                OSStatus stat = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, &passwordLength, (void**)&passwordData, NULL);
                 if (stat == noErr)
                 {
                         if (passwordLength == HASHED_LENGTH)
@@ -3103,7 +3103,7 @@ std::string LLStartUp::loadPasswordFromDisk()
         fclose(fp);
 
         // Decipher with MAC address
-        LLXORCipher cipher(gMACAddress, 6);
+        LLXORCipher cipher(gMACAddress, 6);  // The one and only legitimate use of the users MAC.
         cipher.decrypt(buffer, HASHED_LENGTH);
 
         buffer[HASHED_LENGTH] = '\0';
@@ -3130,7 +3130,7 @@ void LLStartUp::savePasswordToDisk(const std::string& hashed_password)
 {
 #if LL_DARWIN
         SecKeychainItemRef keychainItem;
-        OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, NULL, NULL, &keychainItem);
+        OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, NULL, NULL, &keychainItem);
         if (status == noErr)
         {
                 SecKeychainItemModifyAttributesAndData(keychainItem, NULL, hashed_password.length(), hashed_password.c_str());
@@ -3138,7 +3138,7 @@ void LLStartUp::savePasswordToDisk(const std::string& hashed_password)
         }
         else
         {
-                SecKeychainAddGenericPassword(NULL, 10, "Imprudence", 0, NULL, hashed_password.length(), hashed_password.c_str(), NULL);
+                SecKeychainAddGenericPassword(NULL, 10, "meta-impy", 0, NULL, hashed_password.length(), hashed_password.c_str(), NULL);
         }
 #else
         std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
@@ -3155,7 +3155,7 @@ void LLStartUp::savePasswordToDisk(const std::string& hashed_password)
 
         LLStringUtil::copy((char*)buffer, hashed_password.c_str(), HASHED_LENGTH+1);
 
-        LLXORCipher cipher(gMACAddress, 6);
+        LLXORCipher cipher(gMACAddress, 6);  // The one and only legitimate use of the users MAC.
         cipher.encrypt(buffer, HASHED_LENGTH);
 
         if (fwrite(buffer, HASHED_LENGTH, 1, fp) != 1)
@@ -3173,7 +3173,7 @@ void LLStartUp::deletePasswordFromDisk()
 {
 #if LL_DARWIN
         SecKeychainItemRef keychainItem;
-        OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, NULL, NULL, &keychainItem);
+        OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, NULL, NULL, &keychainItem);
         if (status == noErr)
         {
                 SecKeychainItemDelete(keychainItem);
@@ -3805,7 +3805,7 @@ void init_start_screen(S32 location_id)
 
         LL_DEBUGS("AppInit") << "Loading startup bitmap..." << LL_ENDL;
 
-        std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
+        std::string temp_str = gDirUtilp->getViewerUserDir() + gDirUtilp->getDirDelimiter();
 
         if ((S32)START_LOCATION_ID_LAST == location_id)
         {