diff options
| author | simon <none@none> | 2013-12-09 16:11:09 -0800 |
|---|---|---|
| committer | simon <none@none> | 2013-12-09 16:11:09 -0800 |
| commit | 50cba7940fbea7602f6b55df85fb9a2d2b47279b (patch) | |
| tree | 269464d15a8d4a8803535b843e8ce7dcac7414cb /indra/newview/skins/default/xui/en | |
| parent | 1a456c2e41905e93e393dc2dda0d143ee7611275 (diff) | |
| parent | 4a09065691b6a3461ff2f4541abb3accade207fe (diff) | |
Merge in downstream code for 3.6.13
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_viewer.xml | 16 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 7fab89b693..2aa6206a13 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1314,10 +1314,10 @@ <menu_item_call label="Quickstart" name="Quickstart"> - <menu_item_call.on_click + <menu_item_call.on_click function="Advanced.ShowURL" parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Quickstart/ta-p/1087919"/> - </menu_item_call> + </menu_item_call> <!-- <menu_item_call label="Tutorial" name="Tutorial"> @@ -1326,13 +1326,13 @@ parameter="hud" /> </menu_item_call>--> <menu_item_separator/> - <menu_item_call - label="Knowledge Base" - name="Knowledge Base"> - <menu_item_call.on_click - function="Advanced.ShowURL" + <menu_item_call + label="Knowledge Base" + name="Knowledge Base"> + <menu_item_call.on_click + function="Advanced.ShowURL" parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/> - </menu_item_call> + </menu_item_call> <menu_item_call label="Wiki" name="Wiki"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 4dcc1950ca..0ffce9380e 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3493,7 +3493,7 @@ Version [VERSION] [[INFO_URL] Information about this update] icon="alertmodal.tga" name="DownloadBackgroundDialog" type="alertmodal"> - We have downloaded an update to your [APP_NAME] installation. +We have downloaded an update to your [APP_NAME] installation. Version [VERSION] [[INFO_URL] Information about this update] <tag>confirm</tag> <usetemplate @@ -6352,7 +6352,7 @@ You can only claim public land in the Region you're in. </notification> <notification - icon="notify.tga" + icon="notify.tga" name="RegionAboutToShutdown" persist="false" type="notify"> |