summaryrefslogtreecommitdiff
path: root/indra/llui/llsdparam.cpp
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-09-29 18:03:39 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2011-09-29 18:03:39 +0300
commit6a463a41fec89c7f1eadb77c16eeae169ff777d0 (patch)
treef297c32418eb139eded752ce99b418773328e458 /indra/llui/llsdparam.cpp
parentc44db34a15abd2e96b8fd461e9fb3e217fe648cc (diff)
parent71ed326f51770b215ba5dd2ac8d159c3b764c2d2 (diff)
Merge sergeylproductengine/viewer-experience-fui with richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llsdparam.cpp')
-rw-r--r--indra/llui/llsdparam.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llsdparam.cpp b/indra/llui/llsdparam.cpp
index 9ad13054cb..04919e6991 100644
--- a/indra/llui/llsdparam.cpp
+++ b/indra/llui/llsdparam.cpp
@@ -183,7 +183,7 @@ LLSD* LLParamSDParser::getSDWriteNode(const parser_t::name_stack_t& name_stack)
}
}
- LLSD* child_sd = &(*sd_to_write)[it->first];
+ LLSD* child_sd = it->first.empty() ? sd_to_write : &(*sd_to_write)[it->first];
if (child_sd->isArray())
{