diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-27 14:18:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-27 14:18:22 -0400 |
| commit | 2c3e78f1f1f5851482e5e63d37af1325f3a19550 (patch) | |
| tree | 1871ea15c18377defe5e20a198baf8072e791efc /indra/llcommon/llallocator.cpp | |
| parent | eb03da6e993eb33e1fef9bf53268c66d325adf9a (diff) | |
| parent | c9f1b1b5113031d5879e8fcdcec263626a7d3122 (diff) | |
merge changes for DRTVWR-167
Diffstat (limited to 'indra/llcommon/llallocator.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llcommon/llallocator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llallocator.cpp b/indra/llcommon/llallocator.cpp index 6f6abefc67..87654b5b97 100644..100755 --- a/indra/llcommon/llallocator.cpp +++ b/indra/llcommon/llallocator.cpp @@ -27,7 +27,7 @@ #include "linden_common.h" #include "llallocator.h" -#if LL_USE_TCMALLOC +#if (LL_USE_TCMALLOC && LL_USE_HEAP_PROFILER) #include "google/heap-profiler.h" #include "google/commandlineflags_public.h" |