Merged in lindenlab/viewer-bear

.hgtags

indra/llappearance/llavatarappearance.cpp

indra/llappearance/llavatarappearancedefines.cpp

indra/llappearance/llavatarappearancedefines.h

indra/llappearance/lltexlayer.cpp

indra/llappearance/llwearabletype.cpp

indra/llappearance/llwearabletype.h

indra/llcommon/indra_constants.cpp

indra/llcommon/indra_constants.h

indra/llinventory/llinventorytype.h

indra/llprimitive/llprimitive.cpp

indra/llprimitive/llprimitive.h

indra/newview/VIEWER_VERSION.txt

indra/newview/character/aux_base.tga

indra/newview/character/avatar_lad.xml

indra/newview/llagent.cpp

indra/newview/llagentwearables.cpp

indra/newview/lldynamictexture.cpp

indra/newview/llinventoryicon.cpp

indra/newview/lllocalbitmaps.cpp