From 58bce2d205bee3f5adb33b15efe73098e77429eb Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 9 Sep 2009 01:26:44 +0000
Subject: merge -r132032-132812
 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1

---
 .../default/xui/en/floater_test_inspectors.xml     | 110 +++++++++++++++++++++
 .../skins/default/xui/en/inspect_avatar.xml        |  43 +++++---
 indra/newview/skins/default/xui/en/menu_login.xml  |  26 ++---
 indra/newview/skins/default/xui/en/menu_viewer.xml |   9 +-
 indra/newview/skins/default/xui/en/panel_login.xml |  40 ++++----
 .../newview/skins/default/xui/en/panel_profile.xml |  27 -----
 indra/newview/skins/default/xui/en/strings.xml     |  77 ++++++++++++++-
 .../skins/default/xui/en/widgets/floater.xml       |   6 ++
 8 files changed, 259 insertions(+), 79 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_test_inspectors.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/floater.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
new file mode 100644
index 0000000000..b23bf49435
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="true"
+ height="400"
+ layout="topleft"
+ name="floater_test_inspectors"
+ title="Test Inspectors" 
+ width="400">
+  <text
+   height="20"
+   left="10"
+   name="test_inspectors"
+   top="30"
+   width="300">
+    Click to spawn an inspector:
+  </text>
+  <!-- James Tester, 4 years old -->
+  <button
+    name="avatar_2d_btn1"
+    label="Avatar 2D"
+    top="50"
+    left="10"
+    height="20"
+    width="100"
+	commit_callback.function="ShowAvatarInspector"
+	commit_callback.parameter="22df1dcb-810a-4975-aab9-0159958fe155" />
+	<!-- DonkeyPuncher 2008-10-1 -->
+  <button
+    name="avatar_2d_btn5"
+    label="Avatar 2D"
+    top_pad="10"
+    left="10"
+    height="20"
+    width="100"
+	commit_callback.function="ShowAvatarInspector"
+	commit_callback.parameter="d5330e4e-391a-4f00-9352-b797ed2f9a97" />
+	<!-- DonkeyPuncher 2009-01-15 -->
+  <button
+    name="avatar_2d_btn2"
+    label="Avatar 2D"
+    top_pad="10"
+    left="10"
+    height="20"
+    width="100"
+	commit_callback.function="ShowAvatarInspector"
+	commit_callback.parameter="05511655-a58a-48b6-b645-966f69fc17a7" />
+	<!-- 2009-06-14 -->
+  <button
+    name="avatar_2d_btn3"
+    label="Avatar 2D"
+    top_pad="10"
+    left="10"
+    height="20"
+    width="100"
+	commit_callback.function="ShowAvatarInspector"
+	commit_callback.parameter="6a164b3d-7c2c-43eb-880a-0ebc0687b3ec" />
+	<!-- jarvtest Bombastic 2009-10-3 -->
+  <button
+    name="avatar_2d_btn4"
+    label="Avatar 2D"
+    top_pad="10"
+    left="10"
+    height="20"
+    width="100"
+	commit_callback.function="ShowAvatarInspector"
+	commit_callback.parameter="e7dc3c83-1e11-4fa7-beeb-4b18adfb4efa" />
+  <button
+    name="avatar_3d_btn"
+    label="Avatar 3D"
+    top="50"
+    left="150"
+    height="20"
+    width="100"/>
+  <button
+    name="object_2d_btn"
+    label="Object 2D"
+    top_pad="10"
+    left_delta="0"
+    height="20"
+    width="100"/>
+  <button
+    name="object_3d_btn"
+    label="Object 3D"
+    top_pad="10"
+    left_delta="0"
+    height="20"
+    width="100"/>
+  <button
+    name="group_btn"
+    label="Group"
+    top_pad="10"
+    left_delta="0"
+    height="20"
+    width="100"/>
+  <button
+    name="place_btn"
+    label="Place"
+    top_pad="10"
+    left_delta="0"
+    height="20"
+    width="100"/>
+  <button
+    name="event_btn"
+    label="Event"
+    top_pad="10"
+    left_delta="0"
+    height="20"
+    width="100"/>
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index cee789d435..f908e9d610 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- All our XML is utf-8 encoded. -->
 
-<!-- No title to avoid window chrome -->
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
 <floater
   background_opaque="false"
   background_visible="true"
   bevel_style="in"
-  bg_alpha_color="black"
+  bg_alpha_color="PanelDefaultBackgroundColor"
+  can_close="false" 
   can_minimize="false" 
 	name="inspect_avatar"
+  single_instance="true" 
+  sound_flags="0" 
 	title=""
   visible="true"
 	width="300"
@@ -16,28 +22,39 @@
   left="0"
   top="200"
   >
+  <!-- Allowed fields include:
+	[BORN_ON] ("12/3/2008")
+	[SL_PROFILE] (Second Life profile),
+    [RW_PROFILE] (real world profile),
+	[ACCTTYPE] ("Resident"),
+	[PAYMENTINFO] ("Payment Info on File"),
+	[AGE] ("1 year 2 months") -->
+  <string name="Subtitle">
+[AGE]
+  </string>
+  <string name="Details">
+[ACCTTYPE], [PAYMENTINFO]
+Profile: [SL_PROFILE]
+  </string>
   <text
-      top="180" left="10" width="220" height="70" follows="left|top|right|bottom"
+      top="180" left="10" width="280" height="70" follows="left|top|right|bottom"
       use_ellipses="true"  word_wrap="true"
       font="SansSerifHugeBold" text_color="white"
       mouse_opaque="true" name="user_name" >
-    Codex Linden
+    Test Name
   </text>
+  <!-- General purpose subtitle area, not sure yet what goes here -->
   <text
     top="155" left="10" width="150" height="20" follows="left|top|right|bottom"
-    font="SansSerifBig" font.style="UNDERLINE"
+    font="SansSerifBig"
     text_color="white"
     mouse_opaque="true"
-    name="active_group" >
-    The Guild
-  </text>
+    name="user_subtitle" />
+  <!-- Leave text fields blank so it doesn't flash when data arrives off the network -->
   <text
-      top="110" left="10" width="290" height="50" follows="left|top|right|bottom"
+      top="115" left="10" width="290" height="50" follows="left|top|right|bottom"
       font="SansSerifSmall" text_color="white" word_wrap="true"
-      mouse_opaque="true" name="user_detail" >
-3 year-old account, Payment info on file
-Languages: English, Spanish; +5 Sexterity Vest
-  </text>  
+      mouse_opaque="true" name="user_details" />
   <avatar_icon
       top="185" left="230" width="60" height="60" follows="left|top|right|bottom"
       color="1 1 1 1" enabled="true" mouse_opaque="true" name="avatar_icon"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 1e911c2664..8a2955654e 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -97,18 +97,20 @@
          layout="topleft"
          name="Widget Test"
          shortcut="control|shift|T">
-            <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="test_widgets" />
-        </menu_item_call>
-        <menu_item_call
-         label="Avatar Inspector"
-         name="Avatar Inspector"
-         shortcut="control|shift|I">
-            <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="inspect_avatar" />
-        </menu_item_call>
+        <menu_item_call.on_click
+         function="ShowFloater"
+         parameter="test_widgets" />
+      </menu_item_call>
+      <menu_item_call
+         label="Inspectors Test"
+         name="inspectors_test"
+         shortcut="control|shift|I"
+         >
+        <menu_item_call.on_click
+         function="ShowFloater"
+         parameter="test_inspectors" />
+      </menu_item_call>
+      <menu_item_separator />
         <menu_item_call
          label="Show TOS"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 6bc12368b7..9ad9a87f95 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2751,14 +2751,13 @@
             <menu_item_call.on_click
              function="Advanced.SendTestIMs" />
           </menu_item_call>
-          <!-- *HACK: Hard code James Tester's UUID -->
           <menu_item_call
-           label="Avatar Inspector"
-           name="Avatar Inspector"
+           label="Test Inspectors"
+           name="Test Inspectors"
            shortcut="control|shift|I">
             <menu_item_call.on_click
-             function="Advanced.AvatarInspector"
-             parameter="22df1dcb-810a-4975-aab9-0159958fe155" />
+             function="Floater.Show"
+             parameter="test_inspectors" />
           </menu_item_call>
         </menu>
         <menu
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 794b69d7ed..d943b2ea23 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -55,6 +55,7 @@
      max_length="31"
      name="first_name_edit"
      select_on_focus="true"
+     tool_tip="Enter first name here" 
      top_pad="4"
      width="120" />
     <text
@@ -111,6 +112,25 @@
      select_on_focus="true"
      top_pad="4"
      width="120" />
+     <button
+     follows="left|bottom"
+     height="24"
+     label="Log In"
+     label_selected="Log In"
+     layout="topleft"
+     left="435"
+     name="connect_btn"
+     top="548"
+     width="120" />
+    <combo_box
+     allow_text_entry="true"
+     follows="left|bottom"
+     height="18"
+     layout="topleft"
+     left_pad="15"
+     name="server_combo"
+     top_delta="2"
+     width="120" />
     <text
      type="string"
      length="1"
@@ -158,25 +178,7 @@
      name="remember_check"
      top_delta="3"
      width="138" />
-    <button
-     follows="left|bottom"
-     height="24"
-     label="Log In"
-     label_selected="Log In"
-     layout="topleft"
-     left="435"
-     name="connect_btn"
-     top="548"
-     width="120" />
-    <combo_box
-     allow_text_entry="true"
-     follows="left|bottom"
-     height="18"
-     layout="topleft"
-     left_pad="15"
-     name="server_combo"
-     top_delta="2"
-     width="120" />
+ 
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 135dcb167b..41de34fbed 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -13,33 +13,6 @@
      name="CaptionTextAcctInfo">
         [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
     </string>
-    <string
-     name="AcctTypeResident"
-     value="Resident" />
-    <string
-     name="AcctTypeTrial"
-     value="Trial" />
-    <string
-     name="AcctTypeCharterMember"
-     value="Charter Member" />
-    <string
-     name="AcctTypeEmployee"
-     value="Linden Lab Employee" />
-    <string
-     name="PaymentInfoUsed"
-     value="Payment Info Used" />
-    <string
-     name="PaymentInfoOnFile"
-     value="Payment Info On File" />
-    <string
-     name="NoPaymentInfoOnFile"
-     value="No Payment Info On File" />
-    <string
-     name="AgeVerified"
-     value="Age-verified" />
-    <string
-     name="NotAgeVerified"
-     value="Not Age-verified" />
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b8152a4956..faed615bdd 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -46,7 +46,7 @@
 	<string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
 	
 	
-	<!-- Tooltip, llhoverview.cpp -->
+	<!-- Tooltip, lltooltipview.cpp -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
 	<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
 	<string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
@@ -1913,8 +1913,35 @@ this texture in your inventory
 	<string name="Stomach">Stomach</string>
 	<string name="Left Pec">Left Pec</string>
 	<string name="Right Pec">Right Pec</string>	
-	
-	<!-- HUD Position --> 
+
+  <!-- Avatar age computation, see LLAvatarPropertiesProcessor::ageFromDate -->
+  <string name="YearsMonthsOld">[AGEYEARS][AGEMONTHS]old</string>
+  <string name="WeeksOld">[AGEWEEKS]old</string>
+  <string name="DaysOld">[AGEDAYS]old</string>
+  <string name="TodayOld">Joined today</string>
+  
+  <!-- Use value="" because of trailing spaces -->
+  <string name="AgeYears"  value="[YEARS] years " />
+  <string name="Age1Year"  value="1 year "/>
+  <string name="AgeMonths" value="[MONTHS] months "/>
+  <string name="Age1Month" value="1 month "/>
+  <string name="AgeWeeks"  value="[WEEKS] weeks "/>
+  <string name="Age1Week"  value="1 week "/>
+  <string name="AgeDays"   value="[DAYS] days "/>
+  <string name="Age1Day"   value="1 day "/>
+
+  <!-- Account types, see LLAvatarPropertiesProcessor -->
+  <string name="AcctTypeResident">Resident</string>
+  <string name="AcctTypeTrial">Trial</string>
+  <string name="AcctTypeCharterMember">Charter Member</string>
+  <string name="AcctTypeEmployee">Linden Lab Employee</string>
+  <string name="PaymentInfoUsed">Payment Info Used</string>
+  <string name="PaymentInfoOnFile">Payment Info On File</string>
+  <string name="NoPaymentInfoOnFile">No Payment Info On File</string>
+  <string name="AgeVerified">Age-verified</string>
+  <string name="NotAgeVerified">Not Age-verified</string>
+  
+  <!-- HUD Position --> 
 	<string name="Center 2">Center 2</string>	
 	<string name="Top Right">Top Right</string>	
 	<string name="Top">Top</string>	
@@ -2425,4 +2452,48 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="UpdaterFailStartTitle">
 	  Failed to start viewer
 	</string>
+
+  <!-- IM system messages -->
+  <string name="only_user_message">
+    You are the only user in this session.
+  </string>
+  <string name="offline_message">
+    [FIRST] [LAST] is offline.
+  </string>
+  <string name="invite_message">
+    Click the [BUTTON NAME] button to accept/connect to this voice chat.
+  </string>
+  <string name="muted_message">
+    You have blocked this resident. Sending a message will automatically unblock them.
+  </string>
+  <string name="generic_request_error">
+    Error making request, please try again later.
+  </string>
+  <string name="insufficient_perms_error">
+    You do not have sufficient permissions.
+  </string>
+  <string name="session_does_not_exist_error">
+    The session no longer exists
+  </string>
+  <string name="no_ability_error">
+    You do not have that ability.
+  </string>
+  <string name="not_a_mod_error">
+    You are not a session moderator.
+  </string>
+  <string name="muted_error">
+    A group moderator disabled your text chat.
+  </string>
+  <string name="add_session_event">
+    Unable to add users to chat session with [RECIPIENT].
+  </string>
+  <string name="message_session_event">
+    Unable to send your message to the chat session with [RECIPIENT].
+  </string>
+  <string name="removed_from_group">
+    You have been removed from the group.
+  </string>
+  <string name="close_on_no_ability">
+    You no longer have the ability to be in the chat session.
+  </string>
 </strings>
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
new file mode 100644
index 0000000000..4a866c2eb2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater"
+         bg_opaque_color="FloaterFocusBackgroundColor"
+         bg_alpha_color="FloaterDefaultBackgroundColor"
+         background_visible="true"
+         background_opaque="false"/>
-- 
cgit v1.2.3