merge

.hgtags

indra/llappearance/llavatarappearance.cpp

indra/llappearance/llavatarappearancedefines.h

indra/llcommon/llversionviewer.h

indra/llmessage/llhttpnode.cpp

indra/newview/app_settings/logcontrol.xml

indra/newview/llagent.cpp

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h

indra/newview/llappearancemgr.cpp

indra/newview/llinventorymodel.cpp

indra/newview/llviewertexlayer.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatarself.cpp