summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-12 11:57:07 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-12 11:57:07 +0100
commitc330e26db8b2a3a3fef9eed6225594323090cdb9 (patch)
tree1658cafc671065730ca7380cda375c801013c614 /indra/newview/llappviewer.cpp
parent49b1995d27e65f1836224c80f3980e133441b0c8 (diff)
parentd6996c7d3da4ddbb81a7758e508c1aa477d4edc4 (diff)
slightly conflicty merge from viewer-trunk, again
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0e2507db5b..c8e8b9a221 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2596,6 +2596,8 @@ void LLAppViewer::handleViewerCrash()
{
llinfos << "Handle viewer crash entry." << llendl;
+ llinfos << "Last render pool type: " << LLPipeline::sCurRenderPoolType << llendl ;
+
//print out recorded call stacks if there are any.
LLError::LLCallStacks::print();
@@ -3066,7 +3068,7 @@ bool LLAppViewer::initCache()
gSavedSettings.getBOOL("PurgeCacheOnNextStartup"))
{
gSavedSettings.setBOOL("PurgeCacheOnNextStartup", false);
- mPurgeCache = true;
+ mPurgeCache = true;
}
// We have moved the location of the cache directory over time.