Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lirusaito
2013-06-18 01:18:28 -04:00
parent 12a23c98a1 55ab1429af
commit 3116e4923c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cwdebug/debug.h
View File

@@ -275,7 +275,7 @@ class TeeStream : public std::ostream {
}; };
#if CWDEBUG_LOCATION #if CWDEBUG_LOCATION
class BackTrace { class LL_COMMON_API BackTrace {
private: private:
boost::shared_array<void*> M_buffer; boost::shared_array<void*> M_buffer;
int M_frames; int M_frames;

3
indra/newview/llvoicevivox.cpp
View File

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