# Conflicts: # indra/newview/llvoavatar.cpp Also Reverted reversion of removal of before() wrapper in llstl.h