4 files changed, 35 insertions, 30 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index ef02bfa..db4e11d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -9,7 +9,7 @@
   word_wrap="true">
   The Imprudence Viewer was rocked hard by:
   Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave. 
-  http://imprudenceviewer.org
+  http://kokuaviewer.org/
   
   Imprudence is so awesome thanks to contributions from many generous people:
   
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 c2424d7..c2afe40 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
@@ -827,12 +827,12 @@
     <menu_item_call name="Imprudence Blog"
                     label="Imprudence Blog">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceBlog,http://imprudenceviewer.org/" />
+                userdata="WebLaunchImprudenceBlog,http://blog.kokuaviewer.org/" />
     </menu_item_call>
     <menu_item_call name="Imprudence Forums"
                     label="Imprudence Forums">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" />
+                userdata="WebLaunchImprudenceForums,http://forums.kokuaviewer.org/" />
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Scripting Portal"
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index d4d86c0..e3b6364 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?><notifications>
 
 <global name="VIEWER_NAME">Imprudence</global>
-<global name="VIEWER_SITE">imprudenceviewer.org</global>
+<global name="VIEWER_SITE">kokuaviewer.org</global>
 <global name="SECOND_LIFE">Second Life</global>
 <global name="SECOND_LIFE_SITE">secondlife.com</global>
 
@@ -6870,7 +6870,7 @@ The region you have entered is running a different simulator version. Click this
  icon="notify.tga"
  name="QueryClientTags"
  type="notify">
-Would you like to have the client tag database automatically updated from imprudenceviewer.org?
+Would you like to have the client tag database automatically updated from kokuaviewer.org?
 
 This ensures that you have the latest information available regarding other clients.
   <form name="form">
@@ -6942,7 +6942,7 @@ GRAVITY  --  -9.8
 
 For information about this feature, click "More Info".
   <url option="1" name="url">
-    http://imprudenceviewer.org/wiki/Build_Math_Expressions
+    http://wiki.kokuaviewer.org/wiki/Imprudence:Build_Math_Expressions
   </url>
   <usetemplate
    name="okhelpbuttons"
@@ -6971,7 +6971,7 @@ GLOW --  Glow
 
 For information about this feature, click "More Info".
   <url option="1" name="url">
-    http://imprudenceviewer.org/wiki/Build_Math_Expressions
+    http://wiki.kokuaviewer.org/wiki/Imprudence:Build_Math_Expressions
   </url>
   <usetemplate
    name="okhelpbuttons"
@@ -7088,7 +7088,7 @@ WARNING: Don't restore if you aren't sure where the object will go!
 
 For information about this feature, click "More Info".
   <url option="1" name="url">
-    http://imprudenceviewer.org/wiki/Restore_to_Last_Position
+    http://wiki.kokuaviewer.org/wiki/Imprudence:Restore_to_Last_Position
   </url>
   <usetemplate
    name="okcancelhelpignore"
@@ -7285,22 +7285,20 @@ The new font will appear after you restart [VIEWER_NAME].
 </notification>
 
 <notification
- icon="alertmodal.tga"
  name="FirstPrivacy"
+ icon="alertmodal.tga"
  type="alertmodal">
-Terms of service of the grid you are connecting to require sending a "statistics packet" every 5 minutes.
-That is for example: Data about your hardware (CPU, RAM), number of avatars around, number of sims visited.
-Please check *the grids* privacy policy about usage of that data.
-  <form name="form">
-          <button
-                 index="0"
-                 name="ok"
-                 text="Login anyway"/>
-          <button
-                 index="1"
-                 name="notok"
-                 text="Do not log in"/>
-  </form>
+Attention: The Second Life Terms of Service require that all viewers, including the Imprudence Viewer, send a "statistics packet" to Linden Lab every 5 minutes while you are connected to Second Life.
+
+The packet includes non-personally-identifying data about your computer and your Second Life usage, such as your computer hardware and operating system, average framerate, number of sims visited, number of avatars nearby, and more. Please check the Second Life Privacy Policy for information about how Linden Lab uses this and other data.
+
+The packet is sent only to Linden Lab; the Imprudence Project does not receive or collect any data of this kind.
+
+The Second Life Terms of Service do not allow you to opt out. By logging in to Second Life, you are consenting to this data collection.
+  <usetemplate
+   name="okcancelbuttons"
+   yestext="Log In"
+   notext="Cancel"/>
 </notification>
 
 <!--End Imprudence notifications-->
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 048005d..16dd4ad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -5,7 +5,7 @@
          follows="left|top|right|bottom" mouse_opaque="true" >
 
   <web_browser name="login_html" 
-                         bottom="0" top="-1" left="0" right="-1"
+                         bottom="102" top="-1" left="0" right="-1"
                          border_visible="false" follows="top|left|bottom|right"
                          start_url="data:text/html,
                          %3Chtml%3E
@@ -33,7 +33,7 @@
   <!-- START LOCATION -->
 
         <text name="start_location_text" 
-              bottom="8" left="10" height="16" right="115"
+              bottom="32" left="10" height="16" right="115"
         follows="left|bottom" h_pad="0" halign="right" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -59,7 +59,7 @@
   <!-- FIRST NAME -->
 
         <text name="first_name_text" 
-              bottom="56" left="24" height="16" width="120"
+              bottom="80" left="24" height="16" width="120"
         follows="left|bottom" h_pad="0" halign="left" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -123,7 +123,7 @@
   <!-- GRIDS -->
 
         <text name="grid_text" 
-              bottom="56" left_delta="150" height="16" width="120"
+              bottom="80" left_delta="150" height="16" width="120"
         follows="left|bottom" h_pad="0" halign="left" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -143,7 +143,7 @@
   <!-- LOG IN -->
 
         <button name="connect_btn" label="Log In"
-          bottom="34" left_delta="140" height="24" width="120"
+          bottom="58" left_delta="140" height="24" width="120"
           follows="left|bottom" font="SansSerif" halign="center"
                 mouse_opaque="true" scale_image="TRUE" />
 
@@ -151,7 +151,7 @@
   <!-- ACCOUNT / FORGOT PASSWORD -->
 
         <text name="create_new_account_text"
-              bottom="45" left="-210" height="16" width="200"
+              bottom="69" left="-210" height="16" width="200"
         follows="right|bottom" h_pad="0" halign="right" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -161,7 +161,7 @@
         </text>
 
         <text name="forgot_password_text"
-              bottom="25" left="-210" height="16" width="200"
+              bottom="49" left="-210" height="16" width="200"
         follows="right|bottom" h_pad="0" halign="right" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -174,7 +174,7 @@
   <!-- CHANNEL & VERSION -->
 
         <text name="channel_text"
-              bottom="5" left="-310" height="16" width="300"
+              bottom="29" left="-310" height="16" width="300"
         follows="right|bottom" h_pad="0" halign="right" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -182,4 +182,11 @@
         hover="true" hover_color="50 115 185">
     [CHANNEL] [VERSION]
   </text>
+
+
+  <web_browser name="news_bar"
+               bottom="0" top="20" left="0" right="-1"
+               border_visible="true" follows="left|bottom|right"
+               start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000%22%3E%3C/body%3E%3C/html%3E" />
+
 </panel>