Commit Graph

3 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
Siana Gearz
5213af58a9 Tried to make audio streams stutter less on Unix.
Will have to investigate this a bit further someday.
Postpone until (if ever) Henri explains his decision to choke down
priority of new slplugin processes down to idle.
2010-11-28 03:32:27 +01:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00