4 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	008bebd817	Merge with siana/future	2011-10-13 00:03:56 -05:00
Shyotl	baddb47c44	LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.	2011-08-29 03:44:17 -05:00
Hazim Gazov	7a86d01598	Imported existing code	2010-04-02 02:48:44 -03:00