diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
commit | 95fcff557f19712e23410a07751f2b571fead8a9 (patch) | |
tree | 1eef32416e5e1c9c60d478ae674b2fe9a35d0c55 /indra/newview/skins/default/xui/en/panel_script_ed.xml | |
parent | 3ffc5dc09c186fe0ac57ac66b33bfc105ca01363 (diff) | |
parent | a22e3df7e5570e52abcba4a28103c3d76960a010 (diff) |
fixed merge conflict in .hgtags
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_script_ed.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_script_ed.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index 627b12cfe1..8d42024386 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -28,6 +28,10 @@ name="Title"> Script: [NAME] </panel.string> + <panel.string + name="external_editor_not_set"> + Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting. + </panel.string> <menu_bar bg_visible="false" follows="left|top" |