diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-14 19:45:00 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-14 19:45:00 -0700 |
| commit | 2809778bf1a487e2a2786301d7fd651c82290432 (patch) | |
| tree | 56029eab73f20ea05f0228d5e975880eed3b1e8f /indra/llui | |
| parent | 088f04d9c1f5f6e2b0613a9f3ed4d26e7b9210bf (diff) | |
EXP-1201 FIX Quit button option not present in Mode Changing and Exit viewer dialogs
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/llsdparam.cpp | 7 |
2 files changed, 1 insertions, 7 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 7deedb18b8..04919e6991 100644 --- a/indra/llui/llsdparam.cpp +++ b/indra/llui/llsdparam.cpp @@ -159,11 +159,6 @@ 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()) { @@ -188,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()) { |