merge.

indra/newview/llagentwearables.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llfloaterevent.cpp

indra/newview/llfloaterevent.h

indra/newview/llvoavatarself.cpp

indra/newview/llvovolume.cpp

indra/newview/llworldmap.h

...a/newview/skins/default/textures/navbar/BuyArrow_Over.png

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

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

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

...ewview/skins/default/xui/en/floater_windlight_options.xml

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

...a/newview/skins/default/xui/en/panel_teleport_history.xml

indra/newview/skins/default/xui/es/floater_about.xml

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

...ewview/skins/default/xui/es/floater_animation_preview.xml

.../newview/skins/default/xui/es/floater_avatar_textures.xml

indra/newview/skins/default/xui/es/floater_buy_currency.xml

indra/newview/skins/default/xui/es/floater_buy_land.xml