automated merge

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llview.cpp

indra/llui/llview.h

indra/newview/app_settings/CA.pem

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/llvoavatarself.cpp

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

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

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

.../newview/skins/default/xui/en/floater_preview_gesture.xml

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

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

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

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

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

...view/skins/default/xui/en/panel_notifications_channel.xml