summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-12 11:03:16 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-12 11:03:16 +0100
commit9fbe736774b1049265fd017bfe2413d436d35706 (patch)
tree2077c5ced76eed3d14c3340a9645306e99434bbb /indra/newview/llappviewer.cpp
parent103083b52def07c140dfc8f28989b5f4a93d288a (diff)
parent0a80627bca63ee05ce07df510ebe2072399dd01d (diff)
(slightly hairy) merge from viewer-hotfix
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 8e959993fe..78163adf47 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2581,6 +2581,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();
@@ -3051,7 +3053,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.