diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-10 12:29:20 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-10 12:29:20 -0800 |
| commit | 2420a4b90c964bcc2c928c4593652fdf81e0e20f (patch) | |
| tree | 630cfffb754d87f4500fa2109dbdca9426eec517 /indra/newview/lllocaltextureobject.h | |
| parent | 033d61ddb312080dc986803f6c1921cbd554c598 (diff) | |
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.
Diffstat (limited to 'indra/newview/lllocaltextureobject.h')
0 files changed, 0 insertions, 0 deletions