diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-14 19:47:37 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-14 19:47:37 -0700 |
| commit | 556cd3a53bd96f0dd0c6a860a9715e9756de80a8 (patch) | |
| tree | a573b53e3a6f1975d86769117c6837caecf69998 /indra/llui | |
| parent | b2d20f5a989bde2c4db90091bec37d310cc346fc (diff) | |
| parent | 254eb365432824bd5121bf9009f8bbb2b6c3ec67 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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()) { |