summaryrefslogtreecommitdiff
path: root/indra/llprimitive/tests/llmediaentry_test.cpp
AgeCommit message (Collapse)Author
2010-08-24fixing test names for reporting purposes - removing ' test'. also, updated ↵Aaron Terrell (Enus)
docs to remove that naming schema
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-02-01Use "standard" llsd::equalsRick Pasetto
2009-11-10Fix for Windows compile error.Steve Bennetts
2009-11-10FIX DEV-41949: LLMediaEntry::setWhitelist() and LLMediaEntry::asLLSD() have ↵Rick Pasetto
a contract conflict Review #32 This code will go into both server 1.32 branch and the viewer branch. As proposed in DEV-41949, I've changed setWhitelist(const LLSD &whitelist) to clear the whitelist if the WHITELIST_KEY is not present in the passed-in 'whitelist'. I've also made sure that asLLSD() ensures that the WHITELIST_KEY is erased in the given LLSD.
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-10-02Patches follow merge to latest viewer-20 updatesMark Palange (Mani)
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.