diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-19 16:58:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-19 16:58:21 -0400 |
| commit | 1911586ce41e1b77be8e1e9e88c0de4c508e1b42 (patch) | |
| tree | 9cf1e058b26db11b29152f90bf88f027d4a21190 /indra/llui | |
| parent | 9ac33479aa2fa2a0ad7ec5903bc364a07d1a8c74 (diff) | |
| parent | 1d3f6ef432b714a7659e9a5ee62377e56a843006 (diff) | |
storm-1610
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/llsdparam.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 6085c61f9a..ffe5908a9d 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -245,7 +245,6 @@ LLNotificationForm::LLNotificationForm(const std::string& name, const LLNotifica LLParamSDParser parser; parser.writeSD(mFormData, p.form_elements); - mFormData = mFormData[""]; if (!mFormData.isArray()) { // change existing contents to a one element array 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()) { |