6294d4f7bf
Use "standard" llsd::equals
2010-02-01 15:24:38 -08:00
37ac878ec0
Fix for Windows compile error.
2009-11-10 19:52:58 -08:00
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
b806edf4ac
Redo Bao's broken merge
2009-11-04 14:59:23 -08:00
50247533f9
Merged latest viewer/login-api with latest viewer/viewer-20
2009-10-07 17:51:28 -07:00
b5936ec0ad
Changed license to Viewer GPL to try to fix the Linux build export. Code consists of 4 function stubs, I don't think it's proprietary/internal.
2009-10-04 03:33:18 +00:00
3a0a287058
Patches follow merge to latest viewer-20 updates
2009-10-02 12:59:05 -07:00
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
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Rick Pasetto