automated merge

indra/llcommon/roles_constants.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/lleventinfo.cpp

indra/newview/lleventinfo.h

indra/newview/lleventnotifier.cpp

indra/newview/lleventnotifier.h

indra/newview/llfloaterevent.cpp

indra/newview/llfloaterevent.h

indra/newview/llfloaterworldmap.h

indra/newview/llstartup.cpp

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

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

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

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

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

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

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

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

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