diff options
author | Jacek Antonelli | 2008-10-14 20:25:17 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-10-14 20:28:56 -0500 |
commit | 6ed8d75324849ecb36b0b911de0143348755f8bb (patch) | |
tree | 5a231c0774d6314d299d1dd893d23dda42c4dcc9 /linden/indra/newview/llappviewer.cpp | |
parent | Added Imprudence-specific version numbers. (diff) | |
download | meta-impy-6ed8d75324849ecb36b0b911de0143348755f8bb.zip meta-impy-6ed8d75324849ecb36b0b911de0143348755f8bb.tar.gz meta-impy-6ed8d75324849ecb36b0b911de0143348755f8bb.tar.bz2 meta-impy-6ed8d75324849ecb36b0b911de0143348755f8bb.tar.xz |
Rebranded platform-independent/shared installer/support files.
Replaced instances of "Second Life" with "Imprudence", etc.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llappviewer.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 3ef3894..5b3e38d 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
@@ -293,10 +293,10 @@ BOOL gLogoutInProgress = FALSE; | |||
293 | // Internal globals... that should be removed. | 293 | // Internal globals... that should be removed. |
294 | static std::string gArgs; | 294 | static std::string gArgs; |
295 | 295 | ||
296 | const std::string MARKER_FILE_NAME("SecondLife.exec_marker"); | 296 | const std::string MARKER_FILE_NAME("Imprudence.exec_marker"); |
297 | const std::string ERROR_MARKER_FILE_NAME("SecondLife.error_marker"); | 297 | const std::string ERROR_MARKER_FILE_NAME("Imprudence.error_marker"); |
298 | const std::string LLERROR_MARKER_FILE_NAME("SecondLife.llerror_marker"); | 298 | const std::string LLERROR_MARKER_FILE_NAME("Imprudence.llerror_marker"); |
299 | const std::string LOGOUT_MARKER_FILE_NAME("SecondLife.logout_marker"); | 299 | const std::string LOGOUT_MARKER_FILE_NAME("Imprudence.logout_marker"); |
300 | static BOOL gDoDisconnect = FALSE; | 300 | static BOOL gDoDisconnect = FALSE; |
301 | static std::string gLaunchFileOnQuit; | 301 | static std::string gLaunchFileOnQuit; |
302 | 302 | ||
@@ -1468,15 +1468,15 @@ bool LLAppViewer::initLogging() | |||
1468 | 1468 | ||
1469 | // Remove the last ".old" log file. | 1469 | // Remove the last ".old" log file. |
1470 | std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, | 1470 | std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, |
1471 | "SecondLife.old"); | 1471 | "Imprudence.old"); |
1472 | LLFile::remove(old_log_file); | 1472 | LLFile::remove(old_log_file); |
1473 | 1473 | ||
1474 | // Rename current log file to ".old" | 1474 | // Rename current log file to ".old" |
1475 | std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, | 1475 | std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, |
1476 | "SecondLife.log"); | 1476 | "Imprudence.log"); |
1477 | LLFile::rename(log_file, old_log_file); | 1477 | LLFile::rename(log_file, old_log_file); |
1478 | 1478 | ||
1479 | // Set the log file to SecondLife.log | 1479 | // Set the log file to Imprudence.log |
1480 | 1480 | ||
1481 | LLError::logToFile(log_file); | 1481 | LLError::logToFile(log_file); |
1482 | 1482 | ||
@@ -1658,7 +1658,7 @@ bool LLAppViewer::initConfiguration() | |||
1658 | llinfos << "Command line usage:\n" << clp << llendl; | 1658 | llinfos << "Command line usage:\n" << clp << llendl; |
1659 | 1659 | ||
1660 | std::ostringstream msg; | 1660 | std::ostringstream msg; |
1661 | msg << "Second Life found an error parsing the command line. \n" | 1661 | msg << gSecondLife << " found an error parsing the command line. \n" |
1662 | << "Please see: http://wiki.secondlife.com/wiki/Client_parameters \n" | 1662 | << "Please see: http://wiki.secondlife.com/wiki/Client_parameters \n" |
1663 | << "Error: " << clp.getErrorMessage(); | 1663 | << "Error: " << clp.getErrorMessage(); |
1664 | 1664 | ||
@@ -2654,7 +2654,7 @@ bool LLAppViewer::initCache() | |||
2654 | std::string cache_dir = gDirUtilp->getOSUserAppDir(); | 2654 | std::string cache_dir = gDirUtilp->getOSUserAppDir(); |
2655 | std::string new_cache_dir = gDirUtilp->getOSCacheDir(); | 2655 | std::string new_cache_dir = gDirUtilp->getOSCacheDir(); |
2656 | cache_dir = cache_dir + "/cache"; | 2656 | cache_dir = cache_dir + "/cache"; |
2657 | new_cache_dir = new_cache_dir + "/" + gSecondLife; | 2657 | new_cache_dir = new_cache_dir + "/" + "SecondLife"; |
2658 | if (gDirUtilp->fileExists(cache_dir)) | 2658 | if (gDirUtilp->fileExists(cache_dir)) |
2659 | { | 2659 | { |
2660 | gDirUtilp->setCacheDir(cache_dir); | 2660 | gDirUtilp->setCacheDir(cache_dir); |
@@ -2947,7 +2947,7 @@ void LLAppViewer::badNetworkHandler() | |||
2947 | message << | 2947 | message << |
2948 | "The viewer has detected mangled network data indicative\n" | 2948 | "The viewer has detected mangled network data indicative\n" |
2949 | "of a bad upstream network connection or an incomplete\n" | 2949 | "of a bad upstream network connection or an incomplete\n" |
2950 | "local installation of " << LLAppViewer::instance()->getSecondLifeTitle() << ". \n" | 2950 | "local installation of " << gSecondLife << ". \n" |
2951 | " \n" | 2951 | " \n" |
2952 | "Try uninstalling and reinstalling to see if this resolves \n" | 2952 | "Try uninstalling and reinstalling to see if this resolves \n" |
2953 | "the issue. \n" | 2953 | "the issue. \n" |