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
Cleans up some related code, probably looks nicer with space changes off.. though this is a pretty straightforward change.
Comments out code that still exists in xmls or might likely be added in future.
Each piece tested quite a bit.
g++ 4.2 (and possibly earlier) apparently call a copy
constructor when passing a temporary to a function
that takes a const reference. Added code to allow
copy-constructing the AI*Access classes for this
compiler.
g++-4.2.x also bails out when it encounters files that
do not end on a newline. So, also added those where
they were missing.
Attempted fix on the wlf panel again. Prognosis: Fuck this shit.
aside from that, a couple fixes to other bits and pieces.
Signed-off-by: Beeks <HgDelirium@gmail.com>
Link and unlink buttons are now in the build menu. To facilitate this, some minor elements were adjusted, and the edit boxes were re-aligned. Emerald's layout was pretty sloppy anyway.
More fiddling with the windlight menu, and more dead ends.
Expect at least one more update before night's end to implement the features coming in from the merge.
Signed-off-by: Beeks <HgDelirium@gmail.com>
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>
