Conflicts: indra/newview/app_settings/settings.xml - Removed SinguMuteGestures, since it's EnableGestureSounds now. ~removed in llviewermessage.cpp as well.
Conflicts: indra/newview/app_settings/settings.xml - Removed SinguMuteGestures, since it's EnableGestureSounds now. ~removed in llviewermessage.cpp as well.