diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 6e5e51b7e..b642c6317 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -40,6 +40,7 @@
 
 #if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
 #define OCT_ERRS LL_ERRS("OctreeErrors")
+#define OCTREE_GUARD_CHECK
 #else
 #define OCT_ERRS LL_WARNS("OctreeErrors")
 #endif
@@ -81,6 +82,7 @@ public:
 	virtual void traverse(const LLOctreeNode<T>* node);
 };
 
+#ifdef OCTREE_GUARD_CHECK
 struct OctreeGuard
 {
 	template <typename T>
@@ -108,6 +110,18 @@ struct OctreeGuard
 	}
 	void* mNode;
 };
+#else
+struct OctreeGuard
+{
+	template <typename T>
+	OctreeGuard(const LLOctreeNode<T>* node) {}
+	~OctreeGuard() {}
+	template <typename T>
+	static bool checkGuarded(const LLOctreeNode<T>* node) {return false;}
+};
+#endif
+
+
 template <class T>
 class LLOctreeNode : public LLTreeNode<T>
 {