diff options
| author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
| commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
| tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/llmath/lloctree.h | |
| parent | 1.1 version final (diff) | |
| parent | Merge branch 'sl-base-1.22' into next (diff) | |
| download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz | |
Moved base up to 1.22
Diffstat (limited to 'linden/indra/llmath/lloctree.h')
| -rw-r--r-- | linden/indra/llmath/lloctree.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llmath/lloctree.h b/linden/indra/llmath/lloctree.h index 57b359f..3c94aa3 100644 --- a/linden/indra/llmath/lloctree.h +++ b/linden/indra/llmath/lloctree.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * $LicenseInfo:firstyear=2005&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2005&license=viewergpl$ |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2005-2008, Linden Research, Inc. | 7 | * Copyright (c) 2005-2009, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
| 10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| @@ -38,9 +38,9 @@ | |||
| 38 | #include <set> | 38 | #include <set> |
| 39 | 39 | ||
| 40 | #if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG | 40 | #if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG |
| 41 | #define OCT_ERRS LL_WARNS("OctreeErrors") | ||
| 42 | #else | ||
| 43 | #define OCT_ERRS LL_ERRS("OctreeErrors") | 41 | #define OCT_ERRS LL_ERRS("OctreeErrors") |
| 42 | #else | ||
| 43 | #define OCT_ERRS LL_WARNS("OctreeErrors") | ||
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
| 46 | #define LL_OCTREE_PARANOIA_CHECK 0 | 46 | #define LL_OCTREE_PARANOIA_CHECK 0 |