From 741fee0d75bd31742d40fb6d51162b5cdc351884 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 17 Oct 2008 17:45:39 -0700
Subject: windows compile fix and rebranded help menu

---
 .../newview/skins/default/xui/en-us/alerts.xml     | 20 +++++++--
 .../skins/default/xui/en-us/menu_viewer.xml        | 47 +++++-----------------
 2 files changed, 26 insertions(+), 41 deletions(-)

(limited to 'linden/indra/newview')

diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 75ab238..d05fa03 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -2957,9 +2957,9 @@ Download to your Applications folder?
 			Cancel
 		</option>
 	</alert>
-	<alert modal="true" name="WebLaunchSupportWiki">
+	<alert modal="true" name="WebLaunchImprudenceBlog">
 		<message name="message">
-			Go to the Official Linden Blog, for the Latest News and Information.
+			Go to the Official Imprudence Blog, for the Latest News and Information.
 		</message>
 		<ignore name="ignore">
 			When launching web browser to view the blog
@@ -2971,6 +2971,20 @@ Download to your Applications folder?
 			Cancel
 		</option>
 	</alert>
+	<alert modal="true" name="WebLaunchImprudenceForums">
+		<message name="message">
+			Go to the Official Imprudence Forums to discuss the Imprudence Project.
+		</message>
+		<ignore name="ignore">
+			When launching web browser to view the forums
+		</ignore>
+		<option name="Gotopage">
+			OK
+		</option>
+		<option name="Cancel">
+			Cancel
+		</option>
+	</alert>
 	<alert modal="true" name="WebLaunchLSLGuide">
 		<message name="message">
 			Go to the Scripting Guide for scripting help?
@@ -4239,7 +4253,7 @@ will only work if a script is added with a money() event.
 	</alert>
 	<alert modal="true" name="ClickOpenF1Help">
 		<message name="message">
-			Visit the Second Life Support Web site?
+			Visit the Second Life Support Web site (note: this is not an Imprudence help site)?
 		</message>
 		<ignore name="ignore">
 			When visiting the Second Life Support Website.
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 52cad9e..71044a0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -764,7 +764,7 @@
 
   <menu name="Help" create_jump_keys="true" label="Help"
         opaque="true" tear_off="true">
-    <menu_item_call name="Second Life Help" label="Help"
+    <menu_item_call name="Viewer Help" label="Viewer Help"
                     shortcut="F1">
       <on_click function="ShowFloater" userdata="help f1" />
     </menu_item_call>
@@ -772,10 +772,15 @@
       <on_click function="ShowFloater" userdata="help tutorial" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Official Linden Blog..."
+    <menu_item_call name="Imprudence Blog..."
                     label="Imprudence Blog...">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchSupportWiki,http://www.imprudence.com/" />
+                userdata="WebLaunchImprudenceBlog,http://www.imprudenceviewer.org/" />
+    </menu_item_call>
+    <menu_item_call name="Imprudence Forums..."
+                    label="Imprudence Forums...">
+      <on_click function="PromptShowURL"
+                userdata="WebLaunchImprudenceForums,http://www.imprudenceviewer.org/forums/" />
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Scripting Guide..."
@@ -801,41 +806,7 @@
       <on_click function="ShowFloater" userdata="lag meter" />
     </menu_item_call>
     <menu_item_separator />
-    <menu name="Bug Reporting" create_jump_keys="true"
-          label="Bug Reporting" opaque="true" tear_off="true">
-      <menu_item_call name="Public Issue Tracker..."
-                      label="Public Issue Tracker...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-      </menu_item_call>
-      <menu_item_call name="Publc Issue Tracker Help..."
-                      label="Public Issue Tracker Help...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
-      </menu_item_call>
-      <menu_item_separator />
-      <menu_item_call name="Bug Reporing 101..."
-                      label="Bug Reporting 101...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
-      </menu_item_call>
-      <menu_item_call name="Security Issues..."
-                      label="Security Issues...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
-      </menu_item_call>
-      <menu_item_call name="QA Wiki..." label="QA Wiki...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
-      </menu_item_call>
-      <menu_item_separator />
-      <menu_item_call name="Report Bug..." label="Report Bug...">
-        <on_click function="PromptShowURL"
-                  userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-      </menu_item_call>
-    </menu>
-    <menu_item_separator />
-    <menu_item_call name="About Second Life..."
+    <menu_item_call name="About Imprudence..."
                     label="About Imprudence...">
       <on_click function="ShowFloater" userdata="about" />
     </menu_item_call>
-- 
cgit v1.1