summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmediasettingspermissions.cpp
AgeCommit message (Collapse)Author
2009-10-07DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed ↵Jiao Li
by rick
2009-10-01svn merge -r 134922:134973 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.