diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
| commit | e1c5abce9309a89bd9993264bca8dadadf882c6f (patch) | |
| tree | 81e1f91811b207abd4dfe4c82db31583d92df212 /indra/llprimitive/llmediaentry.cpp | |
| parent | 33eac5dc0a1dfc0624dcfc75bec35155fbb9c917 (diff) | |
| parent | 0bd2567bf5648808a95c7826581199bb371597cb (diff) | |
merge with 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]); |