summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmediaentry.cpp
AgeCommit message (Collapse)Author
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
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.