From feabeb496518f28359f654fdc397354355743589 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Wed, 30 Sep 2009 17:46:31 +0000 Subject: DEV-35039 Viewer 2.0 Help System - Viewer Development svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3 --- .../default/html/en-us/help-offline/index.html | 29 ++++ indra/newview/skins/default/textures/textures.xml | 14 +- .../textures/windows/Icon_Restore_Foreground.png | Bin 0 -> 2955 bytes .../textures/windows/Icon_Restore_Press.png | Bin 0 -> 2971 bytes .../newview/skins/default/xui/en/floater_about.xml | 1 + .../skins/default/xui/en/floater_help_browser.xml | 165 ++------------------- indra/newview/skins/default/xui/en/menu_viewer.xml | 18 --- .../newview/skins/default/xui/en/notifications.xml | 62 -------- .../skins/default/xui/en/panel_script_ed.xml | 4 +- .../default/xui/en/panel_side_tray_tab_caption.xml | 13 ++ indra/newview/skins/default/xui/en/strings.xml | 1 - 11 files changed, 58 insertions(+), 249 deletions(-) create mode 100644 indra/newview/skins/default/html/en-us/help-offline/index.html create mode 100644 indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png create mode 100644 indra/newview/skins/default/textures/windows/Icon_Restore_Press.png (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/html/en-us/help-offline/index.html b/indra/newview/skins/default/html/en-us/help-offline/index.html new file mode 100644 index 0000000000..bf3677603e --- /dev/null +++ b/indra/newview/skins/default/html/en-us/help-offline/index.html @@ -0,0 +1,29 @@ + + + +Offline Help + + + +
+

+ Second Life Offline Help. +

+

+ You are not online and are configured not to fetch help remotely. This is all the help that is available + until more stuff is done. Yeah. +

+
+ + diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 46c294768d..66ea444c15 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -110,12 +110,10 @@ - - @@ -125,16 +123,16 @@ - - - + + + @@ -442,8 +440,6 @@ - - @@ -493,10 +489,6 @@ - - - - diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png new file mode 100644 index 0000000000..1e753aaf1d Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png differ diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png new file mode 100644 index 0000000000..be66b05230 Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png differ diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 97afe6d324..c9e143bf95 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -3,6 +3,7 @@ height="440" layout="topleft" name="floater_about" + help_topic="floater_about" save_rect="true" title="About [APP_NAME]" width="470"> diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml index a1265d49f9..512b4c85a1 100644 --- a/indra/newview/skins/default/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml @@ -1,7 +1,7 @@ + title="Help Browser" + width="620"> http://www.secondlife.com @@ -20,150 +20,13 @@ http://support.secondlife.com - - diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 13a53a4ce3..0f7afcba6e 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -93,7 +93,6 @@ Restore Minimize Tear Off - Edit Dock Undock Show Help -- cgit v1.2.3