diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-10 16:48:26 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-10 16:48:26 +0100 |
| commit | e5c0022a7c102e96d3e93d91eda08af81defeef1 (patch) | |
| tree | c6d712cbc1378b441ccee65ec610de06efdcb532 /indra/newview/skins/default | |
| parent | e075c65ee22a54b114808057399b5c7546dfb08a (diff) | |
| parent | 8c9d758e3a5de9e11b2e33753e61a5359dbff8de (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_fixedenvironment.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml index 73f2683e84..9b572ce9b0 100644 --- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml +++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml @@ -15,6 +15,8 @@ help_topic="fixed_environment" single_instance="true" width="750"> + <string name="edit_sky">Edit Sky:</string> + <string name="edit_water">Edit Water:</string> <layout_stack name="floater_stack" left="5" top="5" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 2ab22cb565..cd642f9531 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -11197,5 +11197,22 @@ Are you sure you want to continue? notext="No" yestext="Yes"/> </notification> + + <notification + icon="alertmodal.tga" + name="SettingsMakeNoTrans" + type="alertmodal"> +You are about to import non-transferable settings into this daycycle. Continuing will cause the settings you are editing to become non-transferable also. + +This change can not be undone. + +Are you sure you want to continue? + <tag>confirm</tag> + <usetemplate + ignoretext="Are you sure you want to make settings non-transferable?" + name="okcancelignore" + notext="No" + yestext="Yes"/> + </notification> </notifications> |