diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-03 12:14:03 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-03 12:14:03 -0500 |
| commit | 30f0d61510a2f7d28bd24d2165807e7e6ced4e55 (patch) | |
| tree | d1640aaa6cd78e33bfe52defdeba5eb807459885 /indra/newview/skins/default | |
| parent | 5f635f7942130ab25f74f5c6aaeb5b135d0cb43e (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
merge changes for 3.6.12-release
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/textures/toolbar_icons/highlighting.png | bin | 457 -> 500 bytes | |||
| -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 |
3 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/skins/default/textures/toolbar_icons/highlighting.png b/indra/newview/skins/default/textures/toolbar_icons/highlighting.png Binary files differindex c227f07513..093bace257 100644 --- a/indra/newview/skins/default/textures/toolbar_icons/highlighting.png +++ b/indra/newview/skins/default/textures/toolbar_icons/highlighting.png diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 95a7839337..e5e2bd4c11 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 bd08c8604f..a93601f5fd 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 @@ -6344,7 +6344,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"> |
