aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llappviewer.cpp')
-rw-r--r--linden/indra/newview/llappviewer.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 8aea221..7555c87 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -309,15 +309,15 @@ BOOL gLogoutInProgress = FALSE;
309// Internal globals... that should be removed. 309// Internal globals... that should be removed.
310static std::string gArgs; 310static std::string gArgs;
311 311
312const std::string MARKER_FILE_NAME("Imprudence.exec_marker"); 312const std::string MARKER_FILE_NAME("meta-impy.exec_marker");
313const std::string ERROR_MARKER_FILE_NAME("Imprudence.error_marker"); 313const std::string ERROR_MARKER_FILE_NAME("meta-impy.error_marker");
314const std::string LLERROR_MARKER_FILE_NAME("Imprudence.llerror_marker"); 314const std::string LLERROR_MARKER_FILE_NAME("meta-impy.llerror_marker");
315const std::string LOGOUT_MARKER_FILE_NAME("Imprudence.logout_marker"); 315const std::string LOGOUT_MARKER_FILE_NAME("meta-impy.logout_marker");
316static BOOL gDoDisconnect = FALSE; 316static BOOL gDoDisconnect = FALSE;
317static std::string gLaunchFileOnQuit; 317static std::string gLaunchFileOnQuit;
318 318
319// Used on Win32 for other apps to identify our window (eg, win_setup) 319// Used on Win32 for other apps to identify our window (eg, win_setup)
320const char* const VIEWER_WINDOW_CLASSNAME = "Imprudence"; 320const char* const VIEWER_WINDOW_CLASSNAME = "meta-impy";
321 321
322//---------------------------------------------------------------------------- 322//----------------------------------------------------------------------------
323// File scope definitons 323// File scope definitons
@@ -1645,12 +1645,12 @@ bool LLAppViewer::initLogging()
1645 1645
1646 // Remove the last ".old" log file. 1646 // Remove the last ".old" log file.
1647 std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, 1647 std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
1648 "Imprudence.old"); 1648 "meta-impy.old");
1649 LLFile::remove(old_log_file); 1649 LLFile::remove(old_log_file);
1650 1650
1651 // Rename current log file to ".old" 1651 // Rename current log file to ".old"
1652 std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, 1652 std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
1653 "Imprudence.log"); 1653 "meta-impy.log");
1654 LLFile::rename(log_file, old_log_file); 1654 LLFile::rename(log_file, old_log_file);
1655 1655
1656 // Set the log file to Imprudence.log 1656 // Set the log file to Imprudence.log
@@ -1817,7 +1817,7 @@ bool LLAppViewer::initConfiguration()
1817 // - set procedural settings 1817 // - set procedural settings
1818 gSavedSettings.setString("ClientSettingsFile", 1818 gSavedSettings.setString("ClientSettingsFile",
1819 // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global"))); 1819 // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));
1820 gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence_experimental.xml")); 1820 gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_meta-impy_experimental.xml"));
1821 1821
1822 gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName()); 1822 gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName());
1823 1823