diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
| commit | fa3b57bd9f0afcf2d38dae27d4b9765624baf758 (patch) | |
| tree | ff083f4e4eec5d6d4e9191f34cae6450e0a318ac /indra/llprimitive/llmediaentry.cpp | |
| parent | 0e63920569302a4f6afcbc0feb28ff379e4a4bac (diff) | |
| parent | b806edf4ac47d18e1a43fb8dbb5fbcad8d13192f (diff) | |
Merge the work lost in 49c9461937df back into the tree
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]); |