diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-07-28 02:05:15 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-07-28 02:05:15 +0300 |
| commit | 677e040a49db4327ba54ce32c18fedffcc121d96 (patch) | |
| tree | 6c2fcc731d8ac8850c7358526f8fa8f4e3a84118 /indra/newview | |
| parent | fe57538d2f96f37cf7f7590e0d2bfd8b907f3e68 (diff) | |
| parent | c3f8eb716162f8cec2b2af2a881807b455c81597 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltoastalertpanel.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 24 |
2 files changed, 23 insertions, 5 deletions
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp index bbce717c20..dbf0893e43 100644 --- a/indra/newview/lltoastalertpanel.cpp +++ b/indra/newview/lltoastalertpanel.cpp @@ -351,6 +351,10 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal { setCheckBox(LLNotifications::instance().getGlobalString("skipnexttime"), ignore_label); } + if (form->getIgnoreType() == LLNotificationForm::IGNORE_WITH_DEFAULT_RESPONSE_SESSION_ONLY) + { + setCheckBox(LLNotifications::instance().getGlobalString("skipnexttimesessiononly"), ignore_label); + } else if (form->getIgnoreType() == LLNotificationForm::IGNORE_WITH_LAST_RESPONSE) { setCheckBox(LLNotifications::instance().getGlobalString("alwayschoose"), ignore_label); diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 6147005d22..4ae809b3fb 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4,6 +4,11 @@ Don't show me this again </global> + <global name="skipnexttimesessiononly"> + + Don't show me this again (for this session only) + </global> + <global name="alwayschoose"> Always choose this option @@ -6004,11 +6009,20 @@ You cannot undo this action. <unique/> [QUESTION] <tag>confirm</tag> - <usetemplate - ignoretext="Confirm before deleting items" - name="okcancelignore" - notext="Cancel" - yestext="OK"/> + <form name="form"> + <ignore name="ignore" + session_only="true" + text="Confirm before deleting items"/> + <button + default="true" + index="0" + name="Yes" + text="OK"/> + <button + index="1" + name="No" + text="Cancel"/> + </form> </notification> <notification |