summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmediasettingsgeneral.h
AgeCommit message (Expand)Author
2009-10-07DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed by...Jiao Li
2009-10-01svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/me...Monroe Williams