summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorMaksymS ProductEngine <msavchenko@productengine.com>2012-08-31 00:38:16 +0300
committerMaksymS ProductEngine <msavchenko@productengine.com>2012-08-31 00:38:16 +0300
commitd1481a599fa8bd65f505e0bd9dec33370a3c68c8 (patch)
tree9813d3eaee5ea8c1b59dc5fb8bb4cfca99a2d888 /indra/newview/llappviewer.cpp
parent5a03b8282da64433c2525f0950e8fb86995f66dc (diff)
MAINT-1486 FIXED Crash on login (Unhandled exception)
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index bf01627bad..78151510d5 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -703,6 +703,14 @@ bool LLAppViewer::init()
LL_INFOS("InitInfo") << "Configuration initialized." << LL_ENDL ;
+ std::string duplicates;
+ if(LLFastTimer::checkForDuplicates(duplicates))
+ {
+ LL_WARNS("InitInfo") << "There are duplicates created by LLFastTimer::DeclareTimer with names: '"
+ << duplicates << "'" << LL_ENDL;
+ return false;
+ }
+
//set the max heap size.
initMaxHeapSize() ;