Commit Graph

3 Commits

Author SHA1 Message Date
Liru Færs
8b85b9b06b Add Copy Page URL to media right click menu 2019-08-26 09:00:32 -04:00
Lirusaito
c848af3960 Merge in Dullahan support from future branch! 2019-04-01 01:26:16 -04:00
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