Skip to content
Snippets Groups Projects
Commit 2809778b authored by Richard Nelson's avatar Richard Nelson
Browse files

EXP-1201 FIX Quit button option not present in Mode Changing and Exit viewer dialogs

parent 088f04d9
No related branches found
No related tags found
No related merge requests found
...@@ -245,7 +245,6 @@ LLNotificationForm::LLNotificationForm(const std::string& name, const LLNotifica ...@@ -245,7 +245,6 @@ LLNotificationForm::LLNotificationForm(const std::string& name, const LLNotifica
LLParamSDParser parser; LLParamSDParser parser;
parser.writeSD(mFormData, p.form_elements); parser.writeSD(mFormData, p.form_elements);
mFormData = mFormData[""];
if (!mFormData.isArray()) if (!mFormData.isArray())
{ {
// change existing contents to a one element array // change existing contents to a one element array
......
...@@ -159,11 +159,6 @@ LLSD* LLParamSDParser::getSDWriteNode(const parser_t::name_stack_t& name_stack) ...@@ -159,11 +159,6 @@ LLSD* LLParamSDParser::getSDWriteNode(const parser_t::name_stack_t& name_stack)
it != name_stack.end(); it != name_stack.end();
++it) ++it)
{ {
if (it->first.empty())
{
continue;
}
bool new_array_entry = false; bool new_array_entry = false;
if (prev_it == mNameStack.end()) if (prev_it == mNameStack.end())
{ {
...@@ -188,7 +183,7 @@ LLSD* LLParamSDParser::getSDWriteNode(const parser_t::name_stack_t& name_stack) ...@@ -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()) if (child_sd->isArray())
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment