diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-07 16:09:32 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-07 16:09:32 -0700 |
| commit | 114e358aae80e9e3ca70de093d51e4700c46df37 (patch) | |
| tree | c96972974d4f37ba87de5dca99399e596ca41f46 /indra/newview/skins/default/xui | |
| parent | e539236a75a163b1c6748617bd1e4d2b84aaa3d6 (diff) | |
Work to make edit floaters respect no mod and no trans. Importing no-trans frame will cause day cycle to become no trans.
Diffstat (limited to 'indra/newview/skins/default/xui')
| -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> |