Merge

indra/llxuixml/llinitparam.h

indra/newview/app_settings/settings.xml

indra/newview/llappearancemgr.cpp

indra/newview/llinventorymodel.cpp

indra/newview/lltexlayer.cpp

indra/newview/llviewermedia.cpp

indra/newview/llviewertexture.cpp

indra/newview/llvoavatarself.cpp

indra/newview/llvoavatarself.h

indra/newview/llwearable.cpp

indra/newview/skins/default/xui/en/floater_about_land.xml

indra/newview/skins/default/xui/ja/floater_about_land.xml

indra/newview/skins/default/xui/ja/floater_postcard.xml

indra/newview/skins/default/xui/ja/floater_tools.xml

indra/newview/skins/default/xui/ja/menu_participant_list.xml

indra/newview/skins/default/xui/ja/notifications.xml