Conflicts(Actually git being dumb, I already merged these, just lost history): indra/newview/llfloateractivespeakers.h - local indra/newview/lloverlaybar.cpp - local indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml - remote