summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-09-12 18:01:26 -0700
committerRichard Nelson <richard@lindenlab.com>2011-09-12 18:01:26 -0700
commitaa75136e1a0ae4adec7693fce8620a9b1034cf91 (patch)
tree91f31c2655f95781b0781b466cc3ab44cda5cc8a
parent1c57963673193d5a3da638848c0540a5fbc91603 (diff)
parent860962d365ba49d063d2f934706a6e4832352b4b (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
-rw-r--r--indra/llui/llsdparam.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llsdparam.cpp b/indra/llui/llsdparam.cpp
index 9ad13054cb..7deedb18b8 100644
--- a/indra/llui/llsdparam.cpp
+++ b/indra/llui/llsdparam.cpp
@@ -159,6 +159,11 @@ LLSD* LLParamSDParser::getSDWriteNode(const parser_t::name_stack_t& name_stack)
it != name_stack.end();
++it)
{
+ if (it->first.empty())
+ {
+ continue;
+ }
+
bool new_array_entry = false;
if (prev_it == mNameStack.end())
{