summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandaudio.h
AgeCommit message (Collapse)Author
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-01-21Fix for bug EXT-4421 (Parcel Voice settings not respected)Aimee Linden
Turns out the UI controls weren't hooked up to anything and so not showing that the parcel was actually voice enabled. Fixed by restoring the same functionality for these controls as in previous viewers, i.e. they now reflect the state of the current parcel, but are disabled when voice is disabled on the region. Reviewed by Lynx.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.