merge

indra/newview/llcofwearables.cpp

indra/newview/llpaneloutfitedit.cpp

indra/newview/llpaneloutfitedit.h

indra/newview/llworldview.cpp

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

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

...ewview/skins/default/xui/da/floater_day_cycle_options.xml

indra/newview/skins/default/xui/da/floater_god_tools.xml

indra/newview/skins/default/xui/da/floater_image_preview.xml

indra/newview/skins/default/xui/da/floater_outgoing_call.xml

indra/newview/skins/default/xui/da/floater_snapshot.xml

indra/newview/skins/default/xui/da/floater_tos.xml

indra/newview/skins/default/xui/da/menu_attachment_other.xml

indra/newview/skins/default/xui/da/menu_attachment_self.xml

indra/newview/skins/default/xui/da/menu_avatar_other.xml

indra/newview/skins/default/xui/da/menu_avatar_self.xml

indra/newview/skins/default/xui/da/menu_edit.xml

...newview/skins/default/xui/da/menu_inspect_avatar_gear.xml

...a/newview/skins/default/xui/da/menu_inspect_self_gear.xml

...a/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml