From e1d8dac25a93db837c780428a23f81cbf9109270 Mon Sep 17 00:00:00 2001
From: Melinda Green <melinda@lindenlab.com>
Date: Mon, 15 Dec 2008 21:21:19 +0000
Subject: svn merge -r105329:105903
 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
 Resolving QAR-1051 Merge featurettes batch #4

---
 indra/llmath/lloctree.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llmath/lloctree.h')

diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 25b7100eb7..5a1efdbe28 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -38,9 +38,9 @@
 #include <set>
 
 #if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
-#define OCT_ERRS LL_WARNS("OctreeErrors")
-#else
 #define OCT_ERRS LL_ERRS("OctreeErrors")
+#else
+#define OCT_ERRS LL_WARNS("OctreeErrors")
 #endif
 
 #define LL_OCTREE_PARANOIA_CHECK 0
-- 
cgit v1.3