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.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 2933fe9..e3d7073 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -2190,25 +2190,19 @@ bool LLAppViewer::initConfiguration()
2190 { 2190 {
2191 llinfos << "Sending crash report." << llendl; 2191 llinfos << "Sending crash report." << llendl;
2192 2192
2193 removeMarkerFile();
2194#if LL_WINDOWS 2193#if LL_WINDOWS
2195 std::string exe_path = gDirUtilp->getAppRODataDir(); 2194 std::string exe_path = gDirUtilp->getAppRODataDir();
2196 exe_path += gDirUtilp->getDirDelimiter(); 2195 exe_path += gDirUtilp->getDirDelimiter();
2197 exe_path += "win_crash_logger.exe"; 2196 exe_path += "win_crash_logger.exe";
2198 2197
2199 std::string arg_string = "-previous -user "; 2198 std::string arg_string = "-previous ";
2200 arg_string += gGridName;
2201 arg_string += " -name \"";
2202 arg_string += gSecondLife;
2203 arg_string += "\"";
2204 // Spawn crash logger. 2199 // Spawn crash logger.
2205 // NEEDS to wait until completion, otherwise log files will get smashed. 2200 // NEEDS to wait until completion, otherwise log files will get smashed.
2206 _spawnl(_P_WAIT, exe_path.c_str(), exe_path.c_str(), arg_string.c_str(), NULL); 2201 _spawnl(_P_WAIT, exe_path.c_str(), exe_path.c_str(), arg_string.c_str(), NULL);
2207#elif LL_DARWIN 2202#elif LL_DARWIN
2208 std::string command_str; 2203 std::string command_str;
2209 command_str = "crashreporter.app/Contents/MacOS/crashreporter "; 2204 command_str = "crashreporter.app/Contents/MacOS/crashreporter ";
2210 command_str += "-previous -user "; 2205 command_str += "-previous";
2211 command_str += gGridName;
2212 // XXX -- We need to exit fullscreen mode for this to work. 2206 // XXX -- We need to exit fullscreen mode for this to work.
2213 // XXX -- system() also doesn't wait for completion. Hmm... 2207 // XXX -- system() also doesn't wait for completion. Hmm...
2214 system(command_str.c_str()); /* Flawfinder: Ignore */ 2208 system(command_str.c_str()); /* Flawfinder: Ignore */
@@ -2223,10 +2217,6 @@ bool LLAppViewer::initConfiguration()
2223 char* const cmdargv[] = 2217 char* const cmdargv[] =
2224 {(char*)cmd.c_str(), 2218 {(char*)cmd.c_str(),
2225 (char*)"-previous", 2219 (char*)"-previous",
2226 (char*)"-user",
2227 (char*)gGridName,
2228 (char*)"-name",
2229 (char*)gSecondLife.c_str(),
2230 NULL}; 2220 NULL};
2231 pid_t pid = fork(); 2221 pid_t pid = fork();
2232 if (pid == 0) 2222 if (pid == 0)