diff options
| author | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
| commit | 089fc07d207c71ce1401e72f09c31ad8c45872e2 (patch) | |
| tree | 0028955add042c6f45b47a7b774adeeac9c592cb /linden/indra/llui/llalertdialog.cpp | |
| parent | Second Life viewer sources 1.16.0.5 (diff) | |
| download | meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.zip meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.gz meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.bz2 meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.xz | |
Second Life viewer sources 1.17.0.12
Diffstat (limited to 'linden/indra/llui/llalertdialog.cpp')
| -rw-r--r-- | linden/indra/llui/llalertdialog.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/llui/llalertdialog.cpp b/linden/indra/llui/llalertdialog.cpp index 547efae..8950fcd 100644 --- a/linden/indra/llui/llalertdialog.cpp +++ b/linden/indra/llui/llalertdialog.cpp | |||
| @@ -783,10 +783,11 @@ bool LLAlertDialog::parseAlerts(const LLString& xml_filename, LLControlGroup* se | |||
| 783 | // label= | 783 | // label= |
| 784 | LLString name; | 784 | LLString name; |
| 785 | child->getAttributeString("name", name); | 785 | child->getAttributeString("name", name); |
| 786 | if (name.empty()) | 786 | |
| 787 | { | 787 | //always set to alert_name for the sake of i18n |
| 788 | name = alert_name; | 788 | //if (name.empty()) |
| 789 | } | 789 | name = alert_name; |
| 790 | |||
| 790 | if (xml_template) | 791 | if (xml_template) |
| 791 | { | 792 | { |
| 792 | xml_template->mIgnorable = LLAlertDialog::IGNORE_USE_DEFAULT; | 793 | xml_template->mIgnorable = LLAlertDialog::IGNORE_USE_DEFAULT; |