diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-10 17:28:19 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-10 17:28:19 -0800 |
| commit | 04eaf3f34fbc0b2ba7f6dd22600e8df1aaa63ed8 (patch) | |
| tree | 63ec15263fc5cd3a8bc9426c40e4ddb27cd689fc /indra/llprimitive/llmediaentry.cpp | |
| parent | 88b937d65c66a99c79b7041e5792ea94aa039d50 (diff) | |
| parent | 353ac3969efc5bda81b34f4edb3756dd6ced0412 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llprimitive/llmediaentry.cpp')
| -rw-r--r-- | indra/llprimitive/llmediaentry.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llprimitive/llmediaentry.cpp b/indra/llprimitive/llmediaentry.cpp index 701300163a..2fc1e5e60c 100644 --- a/indra/llprimitive/llmediaentry.cpp +++ b/indra/llprimitive/llmediaentry.cpp @@ -389,8 +389,12 @@ U32 LLMediaEntry::setWhiteList( const std::vector<std::string> &whitelist ) U32 LLMediaEntry::setWhiteList( const LLSD &whitelist ) { - // If whitelist is undef, this is a no-op. - if (whitelist.isUndefined()) return LSL_STATUS_OK; + // If whitelist is undef, the whitelist is cleared + if (whitelist.isUndefined()) + { + mWhiteList.clear(); + return LSL_STATUS_OK; + } // However, if the whitelist is an empty array, erase it. if (whitelist.isArray()) |