From 801bb8a075ea8aca1496c70ae60d80c6891d6220 Mon Sep 17 00:00:00 2001
From: Router Gray <routergray@gmail.com>
Date: Thu, 9 Apr 2020 10:00:22 -0500
Subject: [PATCH] Compile fix, make types agree in terniary in octree.  Thanks
 Liru.

---
 indra/newview/llvieweroctree.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp
index de4dcc580..98f65487d 100644
--- a/indra/newview/llvieweroctree.cpp
+++ b/indra/newview/llvieweroctree.cpp
@@ -389,7 +389,7 @@ void LLViewerOctreeEntryData::shift(const LLVector4a &shift_vector)
 
 LLViewerOctreeGroup* LLViewerOctreeEntryData::getGroup()const        
 {
-	return mEntry.notNull() ? mEntry->mGroup : NULL;
+	return mEntry.notNull() ? mEntry->mGroup : LLPointer<LLViewerOctreeGroup>();
 }
 
 const LLVector4a& LLViewerOctreeEntryData::getPositionGroup() const