4 Commits (22a851663cddecced21acd88ed8ae4fa9fc733fd)

Author	SHA1	Message	Date
Oz Linden	06b0d72efa	Change license from GPL to LGPL (version 2.1)	2010-08-13 07:24:57 -04:00
Rick Pasetto	2420a4b90c	FIX DEV-41949: LLMediaEntry::setWhitelist() and LLMediaEntry::asLLSD() have 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-10 12:29:20 -08:00
Bryan O'Sullivan	b806edf4ac	Redo Bao's broken merge	2009-11-04 14:59:23 -08:00
Monroe Williams	cf9239cabc	svn merge -r 134922:134973 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.	2009-10-01 02:35:53 +00:00