summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-01-29 09:02:27 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-01-29 09:02:27 -0500
commit674c68cc92ab8c3551fde4243562dfa401e868a1 (patch)
tree1b6da7332d2ad91907c986b598783e381ecfa59c /indra
parent8ab541532083c344a41e18c396b1bcb7fba19bb4 (diff)
SL-315 test old stack trace
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llcallstack.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llcommon/llcallstack.cpp b/indra/llcommon/llcallstack.cpp
index cb77591c7c..7474d4708b 100644
--- a/indra/llcommon/llcallstack.cpp
+++ b/indra/llcommon/llcallstack.cpp
@@ -26,6 +26,7 @@
#include "llcommon.h"
#include "llcallstack.h"
+#include "llstacktrace.h"
#include "StackWalker.h"
#if LL_WINDOWS
@@ -93,5 +94,13 @@ std::ostream& operator<<(std::ostream& s, const LLCallStack& call_stack)
{
s << *it;
}
+ std::vector<std::string> og_lines;
+ ll_get_stack_trace(og_lines);
+ s << "\nOLD SCHOOL STACK\n";
+ for (it=og_lines.begin(); it!=og_lines.end(); ++it)
+ {
+ s << *it;
+ }
+
return s;
}