merge changes for 5.0.0-release

1 files changed, 4 insertions, 0 deletions

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 410a5819b3..5bce2b8809 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -40,6 +40,7 @@ set(llcommon_SOURCE_FILES
     llbase64.cpp
     llbitpack.cpp
     llcallbacklist.cpp
+    llcallstack.cpp
     llcommon.cpp
     llcommonutils.cpp
     llcoros.cpp
@@ -115,6 +116,7 @@ set(llcommon_SOURCE_FILES
     llworkerthread.cpp
     timing.cpp
     u64.cpp
+    StackWalker.cpp
     )
     
 set(llcommon_HEADER_FILES
@@ -135,6 +137,7 @@ set(llcommon_HEADER_FILES
     llbitpack.h
     llboost.h
     llcallbacklist.h
+    llcallstack.h
     llcommon.h
     llcommonutils.h
     llcoros.h
@@ -237,6 +240,7 @@ set(llcommon_HEADER_FILES
     stringize.h
     timer.h
     u64.h
+    StackWalker.h
     )
 
 set_source_files_properties(${llcommon_HEADER_FILES}