Commit Graph

13 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
Lirusaito
af67342969 Merge branch 'master' of git://github.com/siana/SingularityViewer
Conflicts:
	indra/llrender/llvertexbuffer.cpp
Also, reverts indra/newview/skins/default/xui/en-us/panel_audio.xml to before mute-gesture button (For now can be toggled through SinguMuteGestures debug setting)
2012-03-27 07:15:48 -04:00
Lirusaito
385ec62e53 Added scale_image="false" to all mute buttons.
This will allow the mute icons to retain their normal look,
with Shyotl's changes to the UI code.
2012-03-14 08:55:10 -04:00
Lirusaito
96ddbf2a8b Added scale_image="false" to the gesture mute button so it won't span the width of the button. 2012-03-03 01:38:53 -05:00
Lirusaito
81521b98fd Added gesture_muted icon, reworked the panel_audio to look better, and have mute gesture look more like the rest of the panel. 2012-02-22 06:22:05 -05:00
Lirusaito
f253da09ec Added gesture muting feature, like phoenix has. 2012-02-20 16:02:56 -05:00
Inusaito Sayori
d7eb4fc656 Revert to label_width changes made recently for audio sliders. 2012-02-11 02:30:18 -05:00
Lirusaito
6410fb3209 Fix to make audio panel look nice on Windows as well as Linux. 2012-02-07 14:40:10 -05:00
Lirusaito
6fecfad2a2 Removed value panels from volume. 2012-02-01 11:10:23 -05:00
Lirusaito
dfe33963bb More precise volume controls. 2012-01-30 13:38:39 -05:00
Lirusaito
c9269c04be Fix to quick audio controls, made them less fragile. If cherrypicking 0c3bff3, you should cherrypick this as well, and vice-versa. 2012-01-28 06:50:40 -05:00
Lirusaito
8c35361878 Did some more chopping, added value boxes for volume controls that can be set, also made sure that the sliders stayed the same happy size. 2012-01-26 23:25:51 -05:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00