Compile fix, make types agree in terniary in octree. Thanks Liru.

2020-04-09 10:00:22 -05:00
parent be3cbc642b
commit 801bb8a075
1 changed files with 1 additions and 1 deletions
--- 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