diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
| commit | 270629a3fe453e75c0ffeb780419ad3e27eeaa34 (patch) | |
| tree | 5bb2f6f3e6871bc0285ed5b34a0166fd25074d68 /indra/llprimitive/llmediaentry.cpp | |
| parent | a0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (diff) | |
| parent | 6f6d1314e6f1fe12391391172bffa52c9c08e380 (diff) | |
merge from remote repo
Diffstat (limited to 'indra/llprimitive/llmediaentry.cpp')
| -rw-r--r-- | indra/llprimitive/llmediaentry.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llprimitive/llmediaentry.cpp b/indra/llprimitive/llmediaentry.cpp index fa04bf80e7..701300163a 100644 --- a/indra/llprimitive/llmediaentry.cpp +++ b/indra/llprimitive/llmediaentry.cpp @@ -164,6 +164,7 @@ void LLMediaEntry::asLLSD(LLSD& sd) const // "security" fields sd[WHITELIST_ENABLE_KEY] = mWhiteListEnable; + sd.erase(WHITELIST_KEY); for (U32 i=0; i<mWhiteList.size(); i++) { sd[WHITELIST_KEY].append(mWhiteList[i]); |