Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer

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<void*> M_buffer;
     int M_frames;

indra/newview/llvoicevivox.cpp

@@ -26,6 +26,9 @@
 
 #include "llviewerprecompiledheaders.h"
 #include "llvoicevivox.h"
+#if LL_LINUX && defined(LL_STANDALONE)
+#include <glib.h>		// g_find_program_in_path
+#endif
 
 #include "llsdutil.h"