# Conflicts: # indra/newview/llspatialpartition.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvovolume.cpp