2 Commits

Author	SHA1	Message	Date
Lirusaito	3739639295	Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate ... 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	2013-06-23 22:36:04 -04:00
Shyotl	ef3e918558	Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!	2013-05-31 05:33:41 -05:00