From 1754b97e5c0ea60d8a89366598dc49b2fb776f69 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Mon, 17 Jun 2013 17:28:42 +0200 Subject: [PATCH 1/2] Need to export BackTrace::S_Number to use BACKTRACE. --- indra/cwdebug/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h index e14fb18b9..4167813ea 100644 --- a/indra/cwdebug/debug.h +++ b/indra/cwdebug/debug.h @@ -275,7 +275,7 @@ class TeeStream : public std::ostream { }; #if CWDEBUG_LOCATION -class BackTrace { +class LL_COMMON_API BackTrace { private: boost::shared_array M_buffer; int M_frames; From ff6e25b3421556cceea9ce119a8d5eb5495a8696 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Mon, 17 Jun 2013 17:55:27 +0200 Subject: [PATCH 2/2] Compile fix --- indra/newview/llvoicevivox.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index ea15621a1..a56b4c5af 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -26,6 +26,9 @@ #include "llviewerprecompiledheaders.h" #include "llvoicevivox.h" +#if LL_LINUX && defined(LL_STANDALONE) +#include // g_find_program_in_path +#endif #include "llsdutil.h"