diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-26 14:50:13 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-26 14:50:13 -0700 |
| commit | bec806ebd9ae1866a36b89dd0b73d5b3bec49d90 (patch) | |
| tree | c677007f58dfca698dc85c62827605f5ae9ad358 /indra/newview/skins/default/xui | |
| parent | 16ba7ae82cb2e9323e7bf527a57079bf4cfeb634 (diff) | |
| parent | 6ad09b875cd58aedcc5ce1c6edeea05adc16a633 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 11 |
2 files changed, 9 insertions, 12 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index d4e0d16821..b09fb7bbe8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -923,6 +923,14 @@ You need to enter either the Username or both the First and Last name of your av <notification icon="alertmodal.tga" + name="InvalidLocationSLURL" + type="alertmodal"> + <tag>fail</tag> +Your start location did not specify a valid grid. + </notification> + + <notification + icon="alertmodal.tga" name="DeleteClassified" type="alertmodal"> Delete classified '[NAME]'? @@ -1212,7 +1220,7 @@ There was a problem saving a compiled script due to the following reason: [REASO icon="alertmodal.tga" name="StartRegionEmpty" type="alertmodal"> -Oops, Your Start Region is not defined. +Your Start Region is not defined. Please type the Region name in Start Location box or choose My Last Location or My Home as your Start Location. <tag>fail</tag> <usetemplate diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index d227920d9c..44702c828f 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -200,17 +200,6 @@ right="-10" width="200"> Need help logging in? </text> - <!-- <text - follows="right|bottom" - font="SansSerifSmall" - halign="right" - height="28" - top_pad="2" - name="channel_text" - width="180" - word_wrap="true"> - [VERSION] - </text>--> </layout_panel> </layout_stack> </panel> |