Merge commit 'mccabe/rebranding' into rebranding

3 files changed, 67 insertions, 82 deletions

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 8bbdc3d..c2d4301 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?
@@ -4225,7 +4239,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 f82f254..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="Second Life 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..."
-                    label="Official Linden Blog...">
+    <menu_item_call name="Imprudence Blog..."
+                    label="Imprudence Blog...">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchSupportWiki,http://blog.secondlife.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,42 +806,8 @@
       <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..."
-                    label="About Second Life...">
+    <menu_item_call name="About Imprudence..."
+                    label="About Imprudence...">
       <on_click function="ShowFloater" userdata="about" />
     </menu_item_call>
   </menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 02d5504..6fa099e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true"

-     name="groups" width="350">

-        <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"

-             draw_heading="false" draw_stripes="true" enabled="true"

-             follows="left|top|right|bottom" left="10" mouse_opaque="true"

-             multi_select="false" name="group list" tab_stop="true" top="-10"

-             width="240">

-                <column label="" name="name" width="248" />

-        </scroll_list>

-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

-             bottom="22" drop_shadow_visible="true" enabled="true" follows="left|bottom"

-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"

-             mouse_opaque="false" name="groupdesc" v_pad="0" width="248">

-                Your currently active group is displayed in bold.

-        </text>

-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

-             bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"

-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"

-             mouse_opaque="false" name="groupcount" v_pad="0" width="248">

-                You belong to [COUNT] groups (of [MAX] maximum).

-        </text>

-        <pad bottom="-7" height="0" left="-90" width="1" />

-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

-             label="IM/Call" left_delta="0" name="IM"

-             tool_tip="Open Instant Message session" width="80" />

-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

-             label="Info" name="Info" width="80" />

-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

-             label="Activate" name="Activate" width="80" />

-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

-             label="Leave" name="Leave" width="80" />

-        <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"

-             label="Create..." name="Create" width="80" />

-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

-             label="Search..." name="Search..." width="80" />

-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

-             label="Invite..." name="Invite..." width="80" />

-</panel>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true"
+     name="groups" width="350">
+        <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"
+             draw_heading="false" draw_stripes="true" enabled="true"
+             follows="left|top|right|bottom" left="10" mouse_opaque="true"
+             multi_select="false" name="group list" tab_stop="true" top="-10"
+             width="240">
+                <column label="" name="name" width="248" />
+        </scroll_list>
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="22" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+             mouse_opaque="false" name="groupdesc" v_pad="0" width="248">
+                Your currently active group is displayed in bold.
+        </text>
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+             mouse_opaque="false" name="groupcount" v_pad="0" width="248">
+                You belong to [COUNT] groups (of [MAX] maximum).
+        </text>
+        <pad bottom="-7" height="0" left="-90" width="1" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="IM/Call" left_delta="0" name="IM"
+             tool_tip="Open Instant Message session" width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Info" name="Info" width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Activate" name="Activate" width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Leave" name="Leave" width="80" />
+        <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
+             label="Create..." name="Create" width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Search..." name="Search..." width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Invite..." name="Invite..." width="80" />
+</panel>