diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-08-03 14:49:49 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-08-03 14:49:49 -0400 |
| commit | 0664cb1512481b9cd9f5ef4bc398c88416b246a9 (patch) | |
| tree | 552a1d8207942c08ae379dfa916b2e5afcd3912e /indra/llcommon/llallocator.cpp | |
| parent | bf004be1023347bcabaae6baa1624b2ed78d69fd (diff) | |
| parent | 7d98d1afb036ce4b221e101e6de153a3d978ba9f (diff) | |
Automated merge with ssh://hg.lindenlab.com/monty/viewer-drano-http
Diffstat (limited to 'indra/llcommon/llallocator.cpp')
| -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 --- 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" |