From 6a2b10d869a1598b3db17b62bc7f5f9bb8dae39e Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 14 Jan 2010 11:40:24 +0800
Subject: clean up LLFrstUse and it's notification but leave OverideKeys and
 Sandbox intact -- reviewed by james

---
 .../newview/skins/default/xui/en/notifications.xml | 23 ++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3309876376..e709af5097 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -811,6 +811,7 @@ Please select a proposal to view.
 Please select a history item to view.
   </notification>
 
+<!--   
   <notification
    icon="alertmodal.tga"
    name="ResetShowNextTimeDialogs"
@@ -832,6 +833,7 @@ Would you like to disable all popups which can be skipped?
      notext="Cancel"
      yestext="OK"/>
   </notification>
+-->
 
   <notification
    icon="alertmodal.tga"
@@ -5358,6 +5360,7 @@ Grant this request?
     </form>
   </notification>
 
+<!--
   <notification
    icon="notify.tga"
    name="FirstBalanceIncrease"
@@ -5373,6 +5376,7 @@ Your L$ balance is shown in the upper-right.
 You just paid L$[AMOUNT].
 Your L$ balance is shown in the upper-right.
   </notification>
+-->
 
   <notification
    icon="notify.tga"
@@ -5384,6 +5388,8 @@ Your L$ balance will be updated when processing completes. If processing takes m
 
 The status of your payment can be checked on your Transaction History page on your [http://secondlife.com/account/ Dashboard]
   </notification>
+  
+<!-- 
   <notification
    icon="notify.tga"
    name="FirstSit"
@@ -5408,8 +5414,9 @@ Use the controls on the right to find things and display different backgrounds.
    type="notify">
 You have opened the Build Tools. Every object you see around you was created using these tools.
   </notification>
+-->
 
-<!--
+<!--  
   <notification
    icon="notify.tga"
    name="FirstLeftClickNoHit"
@@ -5418,7 +5425,7 @@ You have opened the Build Tools. Every object you see around you was created usi
     If the mouse pointer changes to a hand, you can interact with the object.
     Right-click always shows a menu of things you can do.
   </notification>
--->
+
   <notification
    icon="notify.tga"
    name="FirstTeleport"
@@ -5426,6 +5433,8 @@ You have opened the Build Tools. Every object you see around you was created usi
 You can only teleport to certain areas in this region. The arrow points to your specific destination. Click the arrow to dismiss it.
   </notification>
 
+-->
+
   <notification
    icon="notify.tga"
    name="FirstOverrideKeys"
@@ -5436,6 +5445,7 @@ Some objects (like guns) require you to go into mouselook  to use them.
 Press &apos;M&apos; to do this.
   </notification>
 
+<!--
   <notification
    icon="notify.tga"
    name="FirstAppearance"
@@ -5455,6 +5465,7 @@ This is your Inventory, which contains items you own.
 * To rez something inworld, drag it onto the ground.
 * To read a notecard, double-click it.
   </notification>
+-->
 
   <notification
    icon="notify.tga"
@@ -5465,6 +5476,7 @@ This is a sandbox area, and is meant to help Residents learn how to build.
 Things you build here will be deleted after you leave, so don&apos;t forget to right-click and choose &apos;Take&apos; to move your creation to your Inventory.
   </notification>
 
+<!--
   <notification
    icon="notify.tga"
    name="FirstFlexible"
@@ -5490,13 +5502,16 @@ To toggle this menu,
    type="notify">
 You are editing a Sculpted prim. Sculpties require a special texture to define their shape.
   </notification>
+-->  
 
-  <!--notification
+  <!--
+  <notification
    icon="notify.tga"
    name="FirstMedia"
    type="notify">
     You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
-  </notification-->
+  </notification>
+  -->
 
   <notification
    icon="notifytip.tga"
-- 
cgit v1.2.3


From 43b10c83763518933ff06b3c25f4d05b432f31a1 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Wed, 13 Jan 2010 23:00:35 -0500
Subject: Commit for Lis.

---
 .../skins/default/xui/en/floater_about_land.xml    | 219 +++++++++++----------
 1 file changed, 120 insertions(+), 99 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 33fdd923ad..c58c1f00b9 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -209,7 +209,7 @@
             </text>
              <button
      follows="right"
-     height="16"
+     height="23"
      image_pressed="Info_Press"
      image_unselected="Info_Over"
      left_pad="3"
@@ -218,7 +218,7 @@
      width="16" />
           <!--  <button
              follows="left|top"
-             height="16"
+             height="23"
              label="Profile"
              layout="topleft"
              left_pad="4"
@@ -248,7 +248,7 @@
 Leyla Linden               </text>
                  <button
      follows="right"
-     height="16"
+     height="23"
      image_pressed="Info_Press"
      image_unselected="Info_Over"
      left_pad="3"
@@ -263,10 +263,11 @@ Leyla Linden               </text>
              left_pad="4"
              right="-10"
              name="Set..."
-             width="50" />
+             width="50"
+             top_delta="-2"/>
             <check_box
              enabled="false"
-             height="23"
+             height="16"
              label="Allow Deed to Group"
              layout="topleft"
              left="108"
@@ -284,7 +285,7 @@ Leyla Linden               </text>
              right="-10"
              name="Deed..."
              tool_tip="You may only deed land if you are an officer in the selected group."
-             top_delta="0"
+             top_delta="-2"
              width="90" />
             <check_box
              enabled="false"
@@ -294,7 +295,8 @@ Leyla Linden               </text>
              left="108"
              name="check contrib"
              tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."
-             width="199" />
+             width="199"
+             top_pad="0"/>
             <text
              type="string"
              length="1"
@@ -335,7 +337,7 @@ Leyla Linden               </text>
              layout="topleft"
              left_delta="0"
              name="SalePending"
-             top_pad="6"
+             top_pad="5"
              width="324" />
             <button
              follows="left|top"
@@ -345,7 +347,8 @@ Leyla Linden               </text>
              left_pad="5"
              right="-10"
              name="Sell Land..."
-             width="145" />
+             width="145"
+             top_delta="-25"/>
             <text
              type="string"
              length="1"
@@ -354,7 +357,7 @@ Leyla Linden               </text>
              layout="topleft"
              left_delta="-199"
              name="For sale to"
-             top_delta="2"
+             top_delta="20"
              width="186">
                 For sale to: [BUYER]
             </text>
@@ -366,7 +369,7 @@ Leyla Linden               </text>
              layout="topleft"
              left_delta="0"
              name="Sell with landowners objects in parcel."
-             top_pad="0"
+             top_pad="-3"
              width="186">
                 Objects included in sale
             </text>
@@ -391,7 +394,7 @@ Leyla Linden               </text>
              right="-10"
              name="Cancel Land Sale"
              left_pad="5"
-             top_pad="-10"
+             top_pad="-25"
              width="145" />
             <text
              type="string"
@@ -522,7 +525,7 @@ Leyla Linden               </text>
              layout="topleft"
              left_delta="0"
              name="Reclaim Land..."
-             top_delta="-48"
+             top_delta="-61"
              width="180" />
             <button
              enabled="false"
@@ -810,7 +813,7 @@ Leyla Linden               </text>
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="152"
+             left_delta="190"
              name="objects_available"
              top_delta="0"
              width="260">
@@ -834,7 +837,7 @@ Leyla Linden               </text>
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="200"
+             left_delta="190"
              name="object_contrib_text"
              top_delta="0"
              width="212">
@@ -858,7 +861,7 @@ Leyla Linden               </text>
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="200"
+             left_delta="190"
              name="total_objects_text"
              top_delta="0"
              width="48">
@@ -868,7 +871,7 @@ Leyla Linden               </text>
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="28"
              name="Owned by parcel owner:"
@@ -880,9 +883,9 @@ Leyla Linden               </text>
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
-             left_delta="176"
+             left_delta="172"
              name="owner_objects_text"
              top_delta="0"
              width="48">
@@ -892,33 +895,35 @@ Leyla Linden               </text>
              bottom="100"
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Show"
              label_selected="Show"
              layout="topleft"
              name="ShowOwner"
              right="-140"
-             width="60" />
+             width="60"
+             top_delta="-6"/>
             <button
              bottom="100"
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Return"
              layout="topleft"
              name="ReturnOwner..."
              right="-10"
              tool_tip="Return objects to their owners."
-             width="119" />
+             width="119"
+             top_delta="0"/>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="28"
              name="Set to group:"
-             top="104"
+             top_pad="5"
              width="176">
                 Set to group:
             </text>
@@ -926,9 +931,9 @@ Leyla Linden               </text>
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
-             left_delta="176"
+             left_delta="172"
              name="group_objects_text"
              top_delta="0"
              width="48">
@@ -939,32 +944,34 @@ Leyla Linden               </text>
              enabled="false"
              follows="left|top"
              label="Show"
-             height="20"
+             height="23"
              label_selected="Show"
              layout="topleft"
              name="ShowGroup"
              right="-140"
-             width="60" />
+             width="60"
+             top_delta="-6"/>
             <button
              bottom="120"
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Return"
              layout="topleft"
              name="ReturnGroup..."
              right="-10"
              tool_tip="Return objects to their owners."
-             width="119" />
+             width="119"
+             top_delta="0"/>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="28"
              name="Owned by others:"
-             top="124"
+             top_pad="5"
              width="176">
                 Owned by others:
             </text>
@@ -972,9 +979,9 @@ Leyla Linden               </text>
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
-             left_delta="176"
+             left_delta="172"
              name="other_objects_text"
              top_delta="0"
              width="48">
@@ -984,33 +991,35 @@ Leyla Linden               </text>
              bottom="140"
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Show"
              label_selected="Show"
              layout="topleft"
              name="ShowOther"
              right="-140"
-             width="60" />
+             width="60"
+             top_delta="-6"/>
             <button
              bottom="140"
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Return"
              layout="topleft"
              name="ReturnOther..."
              right="-10"
              tool_tip="Return objects to their owners."
-             width="119" />
+             width="119"
+             top_delta="0"/>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="28"
              name="Selected / sat upon:"
-             top="144"
+             top_pad="5"
              width="176">
                 Selected / sat upon:
             </text>
@@ -1018,9 +1027,9 @@ Leyla Linden               </text>
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
-             left_delta="176"
+             left_delta="172"
              name="selected_objects_text"
              top_delta="0"
              width="48">
@@ -1030,51 +1039,53 @@ Leyla Linden               </text>
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="10"
              name="Autoreturn"
-             top="164"
+             top_pad="0"
              width="294">
-                Autoreturn other residents&apos; objects (minutes, 0 for off):
+                Auto return other Residents&apos; objects (minutes, 0 for off):
             </text>
             <line_editor
              border_style="line"
              border_thickness="1"
              bottom="180"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              max_length="6"
              name="clean other time"
-             right="-50"
-             width="56" />
+             right="-72"
+             width="56"
+             top_delta="-6"/>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="10"
              name="Object Owners:"
-             top="184"
+             top_pad="10"
              width="104">
                 Object Owners:
             </text>
              <button
      follows="top|right"
-     height="20"
+     height="23"
      image_overlay="Refresh_Off"
      layout="topleft"
      name="Refresh List"
      left_pad="5"
      right="-183"
      tool_tip="Refresh Object List"
-     width="20" />
+     width="20"
+  top_delta="-6"/>
             <button
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Return Objects"
              layout="topleft"
              left_pad="6"
@@ -1086,7 +1097,7 @@ Leyla Linden               </text>
              column_padding="0"
              draw_heading="true"
              follows="all"
-             height="190"
+             height="180"
              layout="topleft"
              left="10"
              name="owner list"
@@ -1175,7 +1186,7 @@ Only large parcels can be listed in search.
              name="allow_label"
              top="10"
              width="278">
-                Allow other residents to:
+                Allow other Residents to:
             </text>
             <check_box
              height="16"
@@ -1313,7 +1324,7 @@ Only large parcels can be listed in search.
              width="430" />
             <combo_box
              enabled="false"
-             height="20"
+             height="23"
              layout="topleft"
              left="30"
              name="land category with adult"
@@ -1374,7 +1385,7 @@ Only large parcels can be listed in search.
             </combo_box>
             <combo_box
              enabled="false"
-             height="20"
+             height="23"
              layout="topleft"
              left="30"
              name="land category"
@@ -1463,7 +1474,7 @@ Only large parcels can be listed in search.
              type="string"
              length="1"
              follows="left|top"
-             height="30"
+             height="16"
              layout="topleft"
              left="220"
              top="180"
@@ -1553,12 +1564,13 @@ Only large parcels can be listed in search.
                 Type:
             </text>
             <combo_box
-             height="20"
+             height="23"
              layout="topleft"
              left_pad="0"
              name="media type"
              tool_tip="Specify if the URL is a movie, web page, or other media"
-             width="120" />
+             width="120"
+             top_delta="0"/>
             <text
              follows="left|top"
              height="16"
@@ -1574,27 +1586,29 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="10"
              name="at URL:"
-             width="100">
+             width="100"
+             top_pad="10">
                 Home Page:
             </text>
             <line_editor
              follows="left|top"
-             height="20"
+             height="23"
              layout="topleft"
              left_pad="0"
              max_length="255"
              name="media_url"
              select_on_focus="true"
-             width="300" />
+             width="300"
+             top_delta="0"/>
             <button
              follows="right|top"
-             height="22"
+             height="23"
              label="Set"
              layout="topleft"
              left_pad="5"
-             right="-10"
              name="set_media_url"
-             width="50" />
+             width="50"
+             top_delta="0"/>
             <text
              type="string"
              length="1"
@@ -1603,18 +1617,20 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="10"
              name="CurrentURL:"
-             width="100">
+             width="100"
+             top_pad="10">
                 Current Page:
             </text>
-             <button
-     follows="top|right"
-     height="20"
-     image_overlay="Refresh_Off"
-     layout="topleft"
+            <button
+             follows="top|right"
+             height="23"
+             image_overlay="Refresh_Off"
+             layout="topleft"
              name="reset_media_url"
-     left_pad="0"
-     tool_tip="Refresh URL"
-     width="20" />
+             left_pad="0"
+             tool_tip="Refresh URL"
+             width="23"
+             top_delta="0"/>
             <text
              follows="left|top"
              height="16"
@@ -1623,22 +1639,25 @@ Only large parcels can be listed in search.
              name="current_url"
              width="300" />
             <check_box
+             follows="top|left"
              height="16"
              label="Hide URL"
              layout="topleft"
-             left="110"
+             left_delta="-36"
              name="hide_media_url"
              tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types."
-             width="200" />
+             width="50"
+             top_pad="5"/>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="10"
              name="Description:"
-             width="364">
+             width="364"
+             top_pad="10">
                 Description:
             </text>
             <line_editor
@@ -1650,7 +1669,7 @@ Only large parcels can be listed in search.
              name="url_description"
              select_on_focus="true"
              tool_tip="Text displayed next to play/load button"
-             top_delta="10"
+             top_delta="0"
              width="300" />
             <text
              type="string"
@@ -1674,7 +1693,7 @@ Only large parcels can be listed in search.
              left="110"
              name="media texture"
              tool_tip="Click to choose a picture"
-             top_delta="10"
+             top_delta="0"
              width="64" />
             <text
              type="string"
@@ -1685,16 +1704,17 @@ Only large parcels can be listed in search.
              left_pad="8"
              name="replace_texture_help"
              width="300"
-             word_wrap="true">
+             word_wrap="true"
+             top_delta="0">
              Objects using this texture will show the movie or web page after you click the play arrow.  Select the thumbnail to choose a different texture.
             </text>
             <check_box
              height="16"
              label="Auto scale"
              layout="topleft"
-             left="110"
+             left="107"
              name="media_auto_scale"
-             top_pad="0"
+             top_pad="-10"
              tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."
              width="200" />
             <text
@@ -1706,7 +1726,8 @@ Only large parcels can be listed in search.
              left="10"
              name="media_size"
              tool_tip="Size to render Web media, leave 0 for default."
-             width="100">
+             width="100"
+             top_pad="10">
                 Size:
             </text>
             <spinner
@@ -1714,7 +1735,7 @@ Only large parcels can be listed in search.
              enabled="false"
              follows="left|top"
              halign="right"
-             height="20"
+             height="23"
              increment="1"
              initial_value="0"
              layout="topleft"
@@ -1729,7 +1750,7 @@ Only large parcels can be listed in search.
              enabled="false"
              follows="left|top"
              halign="right"
-             height="20"
+             height="23"
              increment="1"
              initial_value="0"
              layout="topleft"
@@ -1759,7 +1780,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="10"
              name="Options:"
-             top_pad="8"
+             top_pad="10"
              width="100">
                 Options:
             </text>
@@ -1767,10 +1788,10 @@ Only large parcels can be listed in search.
              height="16"
              label="Loop"
              layout="topleft"
-             left_pad="0"
+             left_pad="-3"
              name="media_loop"
              tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."
-             top_delta="0"
+             top_delta="-1"
              width="200" />
         </panel>
         <panel
@@ -1796,12 +1817,12 @@ Only large parcels can be listed in search.
             </text>
             <line_editor
              follows="left|top"
-             height="20"
+             height="23"
              layout="topleft"
              left="100"
              max_length="255"
              name="music_url"
-             top_pad="0"
+             top_delta="0"
              right="-15"
              select_on_focus="true" />
             <text
@@ -1917,7 +1938,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left_delta="0"
              name="limit_payment"
-             tool_tip="Ban unidentified residents."
+             tool_tip="Ban unidentified Residents."
              top_pad="4"
              width="278" />
             <check_box
@@ -1927,7 +1948,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left_delta="0"
              name="limit_age_verified"
-             tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information."
+             tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
              top_pad="4"
              width="278" />
             <check_box
@@ -1941,7 +1962,7 @@ Only large parcels can be listed in search.
              width="278" />
             <check_box
              enabled="false"
-             height="22"
+             height="16"
              label="Sell passes to:"
              layout="topleft"
              left_delta="0"
@@ -1950,7 +1971,7 @@ Only large parcels can be listed in search.
              top_pad="4"
              width="120" />
             <combo_box
-             height="20"
+             height="23"
              layout="topleft"
              left_pad="22"
              name="pass_combo"
@@ -1968,7 +1989,7 @@ Only large parcels can be listed in search.
             <spinner
              enabled="false"
              follows="left|top"
-             height="22"
+             height="23"
              increment="1"
              initial_value="10"
              label="Price in L$:"
@@ -1983,7 +2004,7 @@ Only large parcels can be listed in search.
             <spinner
              enabled="false"
              follows="left|top"
-             height="22"
+             height="23"
              increment="0.25"
              initial_value="1"
              label="Hours of access:"
-- 
cgit v1.2.3


From 4081ec71bb7eb85b9427d72f87c11350ee6e75fd Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Thu, 14 Jan 2010 16:07:24 -0500
Subject: Created new assets and modified xml to clean up tabbed IM window
 layout. http://jira.secondlife.com/browse/EXT-4205

---
 indra/newview/skins/default/textures/textures.xml  |  31 ++++++++++++---------
 .../textures/widgets/ScrollArrow_Left_Opaque.png   | Bin 0 -> 311 bytes
 .../widgets/ScrollArrow_Left_Over_Opaque.png       | Bin 0 -> 330 bytes
 .../textures/widgets/ScrollArrow_Right_Opaque.png  | Bin 0 -> 311 bytes
 .../widgets/ScrollArrow_Right_Over_Opaque.png      | Bin 0 -> 324 bytes
 .../default/textures/widgets/jump_left_in.png      | Bin 0 -> 342 bytes
 .../default/textures/widgets/jump_left_out.png     | Bin 0 -> 321 bytes
 .../default/textures/widgets/jump_right_in.png     | Bin 0 -> 320 bytes
 .../default/textures/widgets/jump_right_out.png    | Bin 0 -> 315 bytes
 .../skins/default/xui/en/floater_im_container.xml  |   1 +
 10 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png
 create mode 100644 indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png
 create mode 100644 indra/newview/skins/default/textures/widgets/jump_left_in.png
 create mode 100644 indra/newview/skins/default/textures/widgets/jump_left_out.png
 create mode 100644 indra/newview/skins/default/textures/widgets/jump_right_in.png
 create mode 100644 indra/newview/skins/default/textures/widgets/jump_right_out.png

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 2d519858db..191eabc38a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -591,15 +591,15 @@ with the same filename but different name
   <texture name="Tool_Zoom" file_name="build/Tool_Zoom.png" preload="false" />
 
   <texture name="Toolbar_Divider" file_name="containers/Toolbar_Divider.png" preload="false" />
-  <texture name="Toolbar_Left_Off" file_name="containers/Toolbar_Left_Off.png" preload="false" />
-  <texture name="Toolbar_Left_Press" file_name="containers/Toolbar_Left_Press.png" preload="false" />
-  <texture name="Toolbar_Left_Selected" file_name="containers/Toolbar_Left_Selected.png" preload="false" />
-  <texture name="Toolbar_Middle_Off" file_name="containers/Toolbar_Middle_Off.png" preload="false" />
-  <texture name="Toolbar_Middle_Press" file_name="containers/Toolbar_Middle_Press.png" preload="false" />
-  <texture name="Toolbar_Middle_Selected" file_name="containers/Toolbar_Middle_Selected.png" preload="false" />
-  <texture name="Toolbar_Right_Off" file_name="containers/Toolbar_Right_Off.png" preload="false" />
-  <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="false" />
-  <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="false" />
+  <texture name="Toolbar_Left_Off" file_name="containers/Toolbar_Left_Off.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Left_Press" file_name="containers/Toolbar_Left_Press.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Left_Selected" file_name="containers/Toolbar_Left_Selected.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Middle_Off" file_name="containers/Toolbar_Middle_Off.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Middle_Press" file_name="containers/Toolbar_Middle_Press.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Middle_Selected" file_name="containers/Toolbar_Middle_Selected.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Right_Off" file_name="containers/Toolbar_Right_Off.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" />
+  <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" />
+  <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" />
 
   <texture name="Tooltip" file_name="widgets/Tooltip.png" preload="true" scale.left="2" scale.top="16" scale.right="100" scale.bottom="3" />
 
@@ -665,10 +665,15 @@ with the same filename but different name
   <texture name="icn_voice-groupfocus.tga" />
   <texture name="icn_voice-pvtfocus.tga" />
 
-  <texture name="jump_left_out.tga" />
-  <texture name="jump_left_in.tga" />
-  <texture name="jump_right_out.tga" />
-  <texture name="jump_right_in.tga" />
+  <texture name="jump_left_out.tga" file_name="widgets/jump_left_out.png" />
+  <texture name="jump_left_in.tga" file_name="widgets/jump_left_in.png" />
+  <texture name="jump_right_out.tga" file_name="widgets/jump_right_out.png" />
+  <texture name="jump_right_in.tga" file_name="widgets/jump_right_in.png" />
+  
+  <texture name="scrollbutton_left_out_blue.tga" file_name="widgets/ScrollArrow_Left_Opaque.png" />
+  <texture name="scrollbutton_left_in_blue.tga" file_name="widgets/ScrollArrow_Left_Over_Opaque.png" />
+  <texture name="scrollbutton_right_out_blue.tga" file_name="widgets/ScrollArrow_Right_Opaque.png" />
+  <texture name="scrollbutton_right_in_blue.tga" file_name="widgets/ScrollArrow_Right_Over_Opaque.png" />
 
   <texture name="up_arrow.tga" file_name="up_arrow.png" />
   <texture name="down_arrow.tga" file_name="down_arrow.png" />
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png
new file mode 100644
index 0000000000..549b3980f6
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png
new file mode 100644
index 0000000000..a74abd5d8a
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png
new file mode 100644
index 0000000000..36056d0ad9
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png
new file mode 100644
index 0000000000..0c1fd6956b
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png differ
diff --git a/indra/newview/skins/default/textures/widgets/jump_left_in.png b/indra/newview/skins/default/textures/widgets/jump_left_in.png
new file mode 100644
index 0000000000..a1425ccfa0
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/jump_left_in.png differ
diff --git a/indra/newview/skins/default/textures/widgets/jump_left_out.png b/indra/newview/skins/default/textures/widgets/jump_left_out.png
new file mode 100644
index 0000000000..38edf47d19
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/jump_left_out.png differ
diff --git a/indra/newview/skins/default/textures/widgets/jump_right_in.png b/indra/newview/skins/default/textures/widgets/jump_right_in.png
new file mode 100644
index 0000000000..39359ab2e2
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/jump_right_in.png differ
diff --git a/indra/newview/skins/default/textures/widgets/jump_right_out.png b/indra/newview/skins/default/textures/widgets/jump_right_out.png
new file mode 100644
index 0000000000..3f76bbffac
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/jump_right_out.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index ccbba61ddf..d97ca554b7 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -19,6 +19,7 @@
      name="im_box_tab_container"
      tab_position="bottom"
      tab_width="80"
+     tab_height="16"
      top="0"
      width="390" />
     <icon
-- 
cgit v1.2.3


From 88c44993f7b96d95ebdc5f67ea8512a09d870a64 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Thu, 14 Jan 2010 16:33:56 -0500
Subject: "Enabled" checkbox for friends log in/out.
 http://jira.secondlife.com/browse/EXT-4204

---
 indra/newview/skins/default/xui/en/panel_preferences_alerts.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 18d0f8acab..ace8281b4e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -31,7 +31,6 @@
      width="300" />
     <check_box
      control_name="ChatOnlineNotification"
-	 enabled="false"
      height="16"
      label="When my friends log out or in"
      layout="topleft"
-- 
cgit v1.2.3


From 9a488fea98cf4611b0a9ab985ab2431e89068435 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Thu, 14 Jan 2010 13:46:00 -0800
Subject: EXT-4283  God Mode bar color is too green

---
 indra/newview/skins/default/colors.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 6da38fa0d4..0117ed86f6 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -56,6 +56,9 @@
 	<color
 	 name="Black_50"
 	 value="0 0 0 0.5" />
+	<color
+	name="FrogGreen"
+	value="0.26 0.345 0.263 1" />
 	<color
 	 name="Red"
 	 value="1 0 0 1" />
@@ -460,7 +463,7 @@
      reference="DkGray" />
     <color
      name="MenuBarGodBgColor"
-     reference="Green" />
+     reference="FrogGreen" />
     <color
      name="MenuDefaultBgColor"
      reference="DkGray2" />
-- 
cgit v1.2.3


From 5b8e709a613e6e0142b3fe08d14f49e9149e7c55 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Thu, 14 Jan 2010 16:35:17 -0800
Subject: EXT-4362 Replace red beacon arrow with anti-aliased png,
 EXT-4363Notification list is too close to the right of the screen, conflicts
 with window resize affordance

---
 indra/newview/skins/default/colors.xml             |  55 +++++++++++----------
 indra/newview/skins/default/textures/textures.xml  |   4 +-
 .../skins/default/textures/world/BeaconArrow.png   | Bin 0 -> 1072 bytes
 .../skins/default/xui/en/panel_bottomtray.xml      |  22 +++++++++
 .../default/xui/en/panel_sidetray_home_tab.xml     |   1 -
 5 files changed, 53 insertions(+), 29 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/world/BeaconArrow.png

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 0117ed86f6..e248047930 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -61,7 +61,7 @@
 	value="0.26 0.345 0.263 1" />
 	<color
 	 name="Red"
-	 value="1 0 0 1" />
+	 value="0.729 0 0.121 1" />
 	<color
 	 name="Blue"
 	 value="0 0 1 1" />
@@ -74,16 +74,19 @@
 	<color
 	 name="Transparent"
 	 value="0 0 0 0" />
+	<color
+	name="Purple"
+	value="1 0 1 1" />
   <!-- This color name makes potentially unused colors show up bright purple.
   Leave this here until all Unused? are removed below, otherwise
   the viewer generates many warnings on startup. -->
   <color
 	 name="Unused?"
-	 value="1 0 1 1" />
+	 value=".831 1 0 1" />
 
   <!-- UI Definitions -->
 
-	<color
+    <color
      name="AgentChatColor"
      reference="White" />
     <color
@@ -172,13 +175,13 @@
      reference="LtGray" />
     <color
      name="ChicletFlashColor"
-     reference="0.114 0.65 0.1" />
+     value="0.114 0.65 0.1" />
     <color
      name="ColorDropShadow"
      reference="Black_50" />
     <color
      name="ColorPaletteEntry01"
-     value="0 0 0 1" />
+     reference="Black" />
     <color
      name="ColorPaletteEntry02"
      value="0.5 0.5 0.5 1" />
@@ -220,34 +223,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     value="1 1 1 1" />
+     reference="White" />
     <color
      name="ColorPaletteEntry16"
-     value="1 1 1 1" />
+     reference="White" />
     <color
      name="ColorPaletteEntry17"
-     value="1 1 1 1" />
+     reference="White" />
     <color
      name="ColorPaletteEntry18"
-     value="0.75 0.75 0.75 1" />
+     reference="LtGray" />
     <color
      name="ColorPaletteEntry19"
-     value="1 0 0 1" />
+     reference="Red" />
     <color
      name="ColorPaletteEntry20"
      reference=".5 .5 1 0" />
     <color
      name="ColorPaletteEntry21"
-     value="0 1 0 1" />
+     reference="Green" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     value="0 0 1 1" />
+     reference="Blue" />
     <color
      name="ColorPaletteEntry24"
-     value="1 0 1 1" />
+     reference="Purple" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -268,10 +271,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     value="1 1 1 1" />
+     reference="White" />
     <color
      name="ColorPaletteEntry32"
-     value="1 1 1 1" />
+     reference="White" />
     <color
      name="ConsoleBackground"
      reference="Black" />
@@ -328,7 +331,7 @@
      value="0.92 0.92 1 0.78" />
     <color
      name="GridlineColor"
-     value="1 0 0 1" />
+     reference="Red" />
     <color
      name="GridlineShadowColor"
      value="0 0 0 0.31" />
@@ -340,10 +343,10 @@
      value="0.3344 0.5456 0.5159 1" />
     <color
      name="GroupNotifyTextColor"
-	 reference="White"/>
+     reference="White"/>
     <color
      name="GroupNotifyDimmedTextColor"
-	 reference="DkGray"/>
+     reference="DkGray" />
     <color
      name="GroupOverTierColor"
      value="0.43 0.06 0.06 1" />
@@ -400,7 +403,7 @@
      reference="DkGray2" />
     <color
      name="InventoryFocusOutlineColor"
-     reference="EmphasisColor" />
+     reference="White_25" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -484,7 +487,7 @@
      reference="Black" />
     <color
      name="MenuNonProductionGodBgColor"
-     value="0 0.5 0 1" />
+     value="0.263 0.325 0.345 1" />
     <color
      name="MenuPopupBgColor"
 	  reference="DkGray2" />
@@ -511,7 +514,7 @@
      value="0 0 0 0.3" />
     <color
      name="NetMapGroupOwnAboveWater"
-     value="1 0 1 1" />
+     reference="Purple" />
     <color
      name="NetMapGroupOwnBelowWater"
      value="0.78 0 0.78 1" />
@@ -544,7 +547,7 @@
      reference="EmphasisColor" />
     <color
      name="OverdrivenColor"
-     value="1 0 0 1" />
+     reference="Red" />
     <color
      name="PanelDefaultBackgroundColor"
      reference="DkGray" />
@@ -643,10 +646,10 @@
      reference="Unused?" />
     <color
      name="SpeakingColor"
-     value="0 1 0 1" />
+     reference="FrogGreen" />
     <color
      name="SystemChatColor"
-	 reference="White" />
+     reference="White" />
     <color
      name="TextBgFocusColor"
      reference="White" />
@@ -661,7 +664,7 @@
      reference="Black" />
     <color
      name="TextDefaultColor"
-     value="Black" />
+     reference="Black" />
     <color
      name="TextEmbeddedItemColor"
      value="0 0 0.5 1" />
@@ -712,7 +715,7 @@
     <color
      name="SysWellItemSelected"
      value="0.3 0.3 0.3 1.0" />
-	<color
+    <color
      name="ChatToastAgentNameColor"
      reference="EmphasisColor" />
   <color
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 191eabc38a..60c1470b89 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -669,7 +669,7 @@ with the same filename but different name
   <texture name="jump_left_in.tga" file_name="widgets/jump_left_in.png" />
   <texture name="jump_right_out.tga" file_name="widgets/jump_right_out.png" />
   <texture name="jump_right_in.tga" file_name="widgets/jump_right_in.png" />
-  
+
   <texture name="scrollbutton_left_out_blue.tga" file_name="widgets/ScrollArrow_Left_Opaque.png" />
   <texture name="scrollbutton_left_in_blue.tga" file_name="widgets/ScrollArrow_Left_Over_Opaque.png" />
   <texture name="scrollbutton_right_out_blue.tga" file_name="widgets/ScrollArrow_Right_Opaque.png" />
@@ -695,7 +695,7 @@ with the same filename but different name
   <texture name="button_anim_play.tga" />
   <texture name="button_anim_play_selected.tga" />
   <texture name="crosshairs.tga" />
-  <texture name="direction_arrow.tga" />
+  <texture name="direction_arrow.tga" file_name="world/BeaconArrow.png" />
 
   <texture name="icon_auction.tga" />
   <texture name="icon_avatar_offline.tga" />
diff --git a/indra/newview/skins/default/textures/world/BeaconArrow.png b/indra/newview/skins/default/textures/world/BeaconArrow.png
new file mode 100644
index 0000000000..d6b3077b11
Binary files /dev/null and b/indra/newview/skins/default/textures/world/BeaconArrow.png differ
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index ca547a79e2..adaab17dc4 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -382,6 +382,17 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          width="40"
          min_width="40"
          user_resize="false">
+         <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         min_width="4"
+         top="0"
+         width="5" />
             <chiclet_notification
              flash_period="0.25"
              follows="right"
@@ -414,6 +425,17 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                    function="Button.SetDockableFloaterToggle"
                    parameter="notification_well_window" />
               </button>
+                      <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         min_width="4"
+         top="0"
+         width="5" />
 	    </chiclet_notification>
         </layout_panel>
     </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 1dd4eb095c..ab3cc036d5 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -4,7 +4,6 @@
  follows="all"
  height="570"
  min_height="350"
- label="home_tab"
  help_topic="sidetray_home"
  layout="topleft"
  top="0"
-- 
cgit v1.2.3


From 6d8081cebf629c31efce4d5eb71360c1bd259721 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Thu, 14 Jan 2010 18:35:32 -0800
Subject: Beacon arrow art now appears clickable

---
 .../skins/default/textures/world/BeaconArrow.png      | Bin 1072 -> 1965 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/world/BeaconArrow.png b/indra/newview/skins/default/textures/world/BeaconArrow.png
index d6b3077b11..12dc246d51 100644
Binary files a/indra/newview/skins/default/textures/world/BeaconArrow.png and b/indra/newview/skins/default/textures/world/BeaconArrow.png differ
-- 
cgit v1.2.3


From b83e37f37ce63d54834b7cf8edf3a5d58a4ba357 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 15 Jan 2010 18:24:16 +0200
Subject: Fixed a minor spelling issue.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_gesture_gear.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
index 4642e82c0b..d96f3c5494 100644
--- a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
@@ -17,7 +17,7 @@
      layout="topleft"
      name="copy_gesture">
         <on_click
-         function="Gesture.Action.CopyPast"
+         function="Gesture.Action.CopyPaste"
          parameter="copy_gesture" />
         <on_enable
          function="Gesture.EnableAction"
@@ -28,7 +28,7 @@
      layout="topleft"
      name="paste">
         <on_click
-         function="Gesture.Action.CopyPast"
+         function="Gesture.Action.CopyPaste"
          parameter="paste" />
         <on_enable
          function="Gesture.EnableAction"
@@ -39,7 +39,7 @@
      layout="topleft"
      name="copy_uuid">
         <on_click
-         function="Gesture.Action.CopyPast"
+         function="Gesture.Action.CopyPaste"
          parameter="copy_uuid" />
         <on_enable
          function="Gesture.EnableAction"
-- 
cgit v1.2.3


From 5c09d482a47a8894ebebc9d3c8053b25a280f58e Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Fri, 15 Jan 2010 18:01:31 +0000
Subject: EXT-4148 EXT-4230: Lots of help ID updates.

Updated the logic of the help ID detection to search sub-panels before
searching active tabs. For some reason, certain tabs are still visible
and active even though they are not being displayed on screen. I also
removed a bunch of help IDs for button panels that just confuse things.

Also went through all of the side panel tabs and added new help IDs
where appropriate. These are:

profile_classified_info
profile_edit_classified
profile_pick_info
profile_edit_pick
my_inventory_tab
recent_inventory_tab
---
 indra/newview/skins/default/xui/en/panel_classified_info.xml | 1 +
 indra/newview/skins/default/xui/en/panel_edit_classified.xml | 1 +
 indra/newview/skins/default/xui/en/panel_edit_pick.xml       | 1 +
 indra/newview/skins/default/xui/en/panel_main_inventory.xml  | 2 ++
 indra/newview/skins/default/xui/en/panel_pick_info.xml       | 1 +
 indra/newview/skins/default/xui/en/panel_picks.xml           | 1 -
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml   | 1 -
 indra/newview/skins/default/xui/en/sidepanel_item_info.xml   | 3 +--
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml   | 3 +--
 9 files changed, 8 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 5c594d3f14..677bdbc3d2 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -7,6 +7,7 @@
  left="0"
  min_height="350"
  name="panel_classified_info"
+ help_topic="profile_classified_info"
  top="0"
  width="333">
  <panel.string
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 1fbf7abda9..188ded3dab 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -9,6 +9,7 @@
  left="0"
  min_height="350"
  name="panel_edit_classified"
+ help_topic="profile_edit_classified"
  top="0"
  width="333">
  <panel.string
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 7769189219..15eff4b67c 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -9,6 +9,7 @@
  left="0"
  min_height="350"
  name="panel_edit_pick"
+ help_topic="profile_edit_pick"
  top="0"
  width="333">
   <button
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 9d00abd2c9..4030c7184a 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -41,6 +41,7 @@ halign="center"
          follows="all"
          height="295"
          label="MY INVENTORY"
+         help_topic="my_inventory_tab"
          layout="topleft"
          left="0"
          name="All Items"
@@ -51,6 +52,7 @@ halign="center"
          follows="all"
          height="295"
          label="RECENT"
+         help_topic="recent_inventory_tab"
          layout="topleft"
          left_delta="0"
          name="Recent Items"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 9c7f38e688..822e049eec 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -7,6 +7,7 @@
  left="0"
  min_height="350"
  name="panel_pick_info"
+ help_topic="profile_pick_info"
  top="0"
  width="333">
     <button
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 1fc553ff36..a2b0adf9d9 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -124,7 +124,6 @@
          height="25"
          top_pad="10"
          name="buttons_cucks"
-         help_topic="picks_button_tab"
          width="313">
        <button
          enabled="false"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 51974be854..fb5f9d2ec8 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -33,7 +33,6 @@
 		<panel
 			 height="25"
 			 layout="bottomright"
-			 help_topic="item_button_tab"
 			 name="button_panel"
 			 left="5"
 			 bottom="5"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 4a992dadd9..e18f59ab64 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -401,7 +401,6 @@ top_pad="10"
     <panel
 		 height="30"
 		 layout="bottomright"
-		 help_topic="button_tab"
 		 name="button_panel"
 		 left="5"
 		 bottom="2"
@@ -414,4 +413,4 @@ top_pad="10"
 		     right="-1"
 		     width="100" />
 	    </panel>
-	</panel>
\ No newline at end of file
+	</panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 2dfcdf4a4c..74f97dca4e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -518,7 +518,6 @@
     <panel
 		 height="25"
 		 layout="bottomright"
-		 help_topic="button_tab"
 		 name="button_panel"
 		 left="5"
 		 bottom="5"
@@ -551,4 +550,4 @@
 		     top="0"
 		     width="100" />
 	</panel>
-</panel>
\ No newline at end of file
+</panel>
-- 
cgit v1.2.3


From b0b68903734cbfbfcf9bfcb7d47cf766a9897d0e Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Fri, 15 Jan 2010 14:57:00 -0500
Subject: EXT-4253 "unsaved" detection seems buggy

Corrected bug where saving an outfit wouldn't update the "unsaved" marker on
the UI. Also switched the UI to use a popup dialog to request the name of
the outfit being made, as we could not convey everything we needed to on the
button alone.

Code reviewed by Vir
---
 .../default/xui/en/floater_outfit_save_as.xml      | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_outfit_save_as.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
new file mode 100644
index 0000000000..c3d84de9a7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ border="true"
+ can_close="false"
+ can_minimize="false"
+ height="100"
+ layout="topleft"
+ name="modal container"
+ width="240">
+    <button
+     height="20"
+     label="Save"
+     label_selected="Save"
+     layout="topleft"
+     left="20"
+     name="Save"
+     top="70"
+     width="82" />
+    <button
+     height="20"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     left_pad="36"
+     name="Cancel"
+     top_delta="0"
+     width="82" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left="20"
+     name="Save item as:"
+     top="10"
+     width="200">
+        Save outfit as:
+    </text>
+    <line_editor
+     type="string"
+     length="1"
+     border_style="line"
+     border_thickness="1"
+     follows="left|top"
+     font="SansSerif"
+     handle_edit_keys_directly="true"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     max_length="63"
+     name="name ed"
+     top_pad="4"
+     width="200">
+        [DESC]
+    </line_editor>
+</floater>
-- 
cgit v1.2.3