diff options
| author | Richard Linden <none@none> | 2010-09-17 17:29:12 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-17 17:29:12 -0700 |
| commit | 2deaa895de081982f4191db0810aa470da5348a2 (patch) | |
| tree | a05087bd4901b9f52ea0c8c9825539665cbf9fcd | |
| parent | 1c3b38cace6d3a673c83230f6f3f20b430738042 (diff) | |
| parent | a67acc2afa3e7369cb0ee29fcca0048f1b4eb23f (diff) | |
merge
| -rw-r--r-- | indra/llui/llnotifications.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_media_browser.xml | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 6a0d64e876..2a7ca4c321 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -618,8 +618,7 @@ void LLNotification::respond(const LLSD& response) if (mForm->getIgnoreType() != LLNotificationForm::IGNORE_NO) { - bool show_notification = !mIgnored; - mForm->setIgnored(!show_notification); + mForm->setIgnored(mIgnored); if (mIgnored && mForm->getIgnoreType() == LLNotificationForm::IGNORE_WITH_LAST_RESPONSE) { LLUI::sSettingGroups["ignores"]->setLLSD("Default" + getName(), response); @@ -745,6 +744,8 @@ void LLNotification::init(const std::string& template_name, const LLSD& form_ele // apply substitution to form labels mForm->formatElements(mSubstitutions); + mIgnored = mForm->getIgnored(); + LLDate rightnow = LLDate::now(); if (mTemplatep->mExpireSeconds) { diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index 1cb8613eb4..4701d7eca8 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -85,6 +85,7 @@ left_pad="5" max_chars="1024" name="address" + combo_editor.select_on_focus="true" top_delta="0" width="540"> <combo_box.commit_callback |