summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-08-30 16:49:25 -0700
committerRichard Linden <none@none>2012-08-30 16:49:25 -0700
commit9e031934461c72fb97eecd4f074e1fe6d43fc1c0 (patch)
tree4562dd2d35fb1f3ef331610e11d61a094e1461e4
parentf5ce2c2940e1f3c72df8886d95b70ef53554f642 (diff)
MAINT-1486 FIX Crash on login (Unhandled exception)
removed checkforDuplicates since we support duplicates again
-rw-r--r--indra/newview/llappviewer.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 78151510d5..bf01627bad 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -703,14 +703,6 @@ 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() ;