Conflicts:
indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel
indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two.
Compile fixies:
indra/newview/llavataractions.cpp needed to include llnotifications.h
indra/newview/llvoicechannel.cpp needed to include llnotifications.h
Added Windlight Water options to it.
Known issue where it starts in collapsed mode when it should be expanded, or visa versa.
While working on the overlay bar, the IM counter got mixed in a bit so that may start working soon.
Rolled back some changes made in an attempt to clean up the vertical IM tabs.
Signed-off-by: Beeks <HgDelirium@gmail.com>