summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2012-11-29 23:33:31 -0800
committerAura Linden <aura@lindenlab.com>2012-11-29 23:33:31 -0800
commit1149c94c5b5008f6c076ce4b072f54e48c4783ae (patch)
treeee0578bb4db47d7a8c0c4f5019bbd96bca709c05 /indra
parentacc53a1c226999878d26b0b4bd58ac8df3256c06 (diff)
Crashlogger only runs when it comes from teamcity so I must checkin debug and wait. What fun.
Diffstat (limited to 'indra')
-rw-r--r--indra/llcrashlogger/llcrashlogger.cpp2
-rw-r--r--indra/llvfs/lldir.cpp3
-rw-r--r--indra/mac_crash_logger/mac_crash_logger.cpp8
3 files changed, 3 insertions, 10 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index d6dcde4b9f..7ecb34eaf6 100644
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -384,7 +384,7 @@ bool LLCrashLogger::init()
LLCurl::initClass(false);
// We assume that all the logs we're looking for reside on the current drive
- gDirUtilp->initAppDirs("SecondLife");
+ gDirUtilp->initAppDirs("com.secondlife.indra.viewer");
LLError::initForApplication(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
index 32d081d552..bd5ce4acac 100644
--- a/indra/llvfs/lldir.cpp
+++ b/indra/llvfs/lldir.cpp
@@ -431,6 +431,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
llassert(0);
}
+ llinfos << "SPATTERS got " << prefix << " for location " << location << llendl;
std::string filename = in_filename;
if (!subdir2.empty())
{
@@ -471,7 +472,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
expanded_filename.assign("");
}
- //llinfos << "*** EXPANDED FILENAME: <" << expanded_filename << ">" << llendl;
+ llinfos << "*** EXPANDED FILENAME: <" << expanded_filename << ">" << llendl;
return expanded_filename;
}
diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp
index 4d0a7af27f..5e6806c08e 100644
--- a/indra/mac_crash_logger/mac_crash_logger.cpp
+++ b/indra/mac_crash_logger/mac_crash_logger.cpp
@@ -34,12 +34,6 @@
int main(int argc, char **argv)
{
- std::ofstream outputFile;
- outputFile.open("/tmp/aura.txt");
- outputFile << "TEstiNG" << std::endl;
- llinfos << "SPATTERS ASDFSDFSDF" << llendl;
- llinfos << "Starting crash reporter." << llendl;
-
LLCrashLoggerMac app;
app.parseCommandOptions(argc, argv);
@@ -57,7 +51,5 @@ int main(int argc, char **argv)
app.cleanup();
llinfos << "Crash reporter finished normally." << llendl;
- outputFile.close();
-
return 0;
}