Automated merge with bundle:c:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg._vi9rd\http__bitbucket.org_lindenlab_viewer-interesting_s1et2g.hg

1 files changed, 7 insertions, 2 deletions

diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index 2db44adacf..d97fa74c24 100755
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -131,10 +131,10 @@ struct SortTimerByName
     }
 };
 
+static BlockTimerStatHandle sRootTimer("root", NULL);
 BlockTimerStatHandle& BlockTimerStatHandle::getRootTimeBlock()
 {
-	static BlockTimerStatHandle root_timer("root", NULL);
-	return root_timer;
+	return sRootTimer;
 }
 
 void BlockTimerStatHandle::pushLog(LLSD log)
@@ -333,6 +333,11 @@ std::vector<BlockTimerStatHandle*>& BlockTimerStatHandle::getChildren()
 	return getTreeNode().mChildren;
 }
 
+bool BlockTimerStatHandle::hasChildren()
+{
+	return ! getTreeNode().mChildren.empty();
+}
+
 // static
 void BlockTimerStatHandle::logStats()
 {