diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-10 09:41:19 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-10 09:41:19 -0800 |
| commit | 42dc3079541e9f5a9fe99d7576ed7e1391d872b9 (patch) | |
| tree | 43e3f1b4be0c8814fec8a7ff1fbaf6e50b84be89 /indra/newview/llvovolume.cpp | |
| parent | 93adff4569d66d0a8699615b7a21d789921ca15c (diff) | |
| parent | f4186b6d3d45259c83fa1b13db25abcd34f227a9 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index c987dd1764..5ac6dcce5a 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -108,6 +108,11 @@ public: if (te->getMediaData() != NULL) { result = te->getMediaData()->asLLSD(); + // XXX HACK: workaround bug in asLLSD() where whitelist is not set properly + if (!result.has(LLMediaEntry::WHITELIST_KEY)) + { + result[LLMediaEntry::WHITELIST_KEY] = LLSD::emptyArray(); + } } } return result; |