# Conflicts: # indra/newview/llagentwearables.cpp # indra/newview/llface.cpp # indra/newview/llpanelpeople.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llviewertexturelist.cpp