From eeb1970f79d34de3c8d531ae7d7da52d30246c36 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 3 Dec 2009 11:57:58 +0200
Subject: fixed normal bug EXT-3038 (Verb buttons in avatar profile panel don't
 have tool-tips)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_my_profile.xml | 2 ++
 indra/newview/skins/default/xui/en/panel_picks.xml      | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index fe3e010cf9..3c87331199 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -416,6 +416,7 @@
          left="10"
          label="Edit Profile"
          name="edit_profile_btn"
+         tool_tip="Edit your personal information"
          width="130" />
         <button
          follows="bottom|right"
@@ -423,6 +424,7 @@
          label="Edit Appearance"
          left_pad="10"
          name="edit_appearance_btn"
+         tool_tip="Create/edit your appearance: physical data, clothes and etc."
          right="-10"
          width="130" />
  </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 4c2bd67337..27f5e4e3de 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -138,6 +138,7 @@
          left="5"
          name="info_btn"
          tab_stop="false"
+         tool_tip="Show pic information"
          top="0"
          width="55" />
         <button
@@ -149,6 +150,7 @@
          left_pad="5"
          name="teleport_btn"
          tab_stop="false"
+         tool_tip="Teleport to the corresponding area"
          top="0"
          width="77" />
         <button
@@ -160,6 +162,7 @@
          left_pad="5"
          name="show_on_map_btn"
          tab_stop="false"
+         tool_tip="Show corresponding area on the world map"
          top="0"
          width="50" />
         </panel>
-- 
cgit v1.2.3


From 0c6c590a67279af2e082605fbc9d128718e18f7c Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 3 Dec 2009 12:07:31 +0200
Subject: fixed low bug EXT-3040 (Tool-tip for '+' icon on Picks tab says
 nothing about classifieds)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_picks.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 27f5e4e3de..52bc72fe86 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -106,7 +106,7 @@
              layout="topleft"
              left_pad="15"
              name="new_btn"
-             tool_tip="Create new pick at current location"
+             tool_tip="Create new pick or classified at current location"
              top="5"
              width="18" />
             <button
-- 
cgit v1.2.3


From 96a11910b19254e180247f76b9c0c201bbdf178c Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 4 Dec 2009 13:46:58 +0200
Subject: Fixed normal bug EXT-1710 (IM & Chat: System messages should have SL
 icon and title). "i" icon is temporarily used, changing it in xml to SL icon
 moved to new bug- EXT-3132.

--HG--
branch : product-engine
---
 indra/newview/skins/default/textures/textures.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 607b33fbb1..9c7726def3 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -481,6 +481,7 @@ with the same filename but different name
   <texture name="SliderThumb_Off" file_name="widgets/SliderThumb_Off.png" />
   <texture name="SliderThumb_Disabled" file_name="widgets/SliderThumb_Disabled.png" />
   <texture name="SliderThumb_Press" file_name="widgets/SliderThumb_Press.png" />
+  <texture name="SL_Logo" file_name="map_infohub.tga" />
 
   <texture name="Snapshot_Off" file_name="bottomtray/Snapshot_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
   <texture name="Snapshot_Over" file_name="bottomtray/Snapshot_Over.png" preload="false" />
-- 
cgit v1.2.3


From fc0679cd834b4580d9d87023376f146fa6988d5f Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 4 Dec 2009 14:51:58 +0200
Subject: Implemented normal task EXT-3082 (Remove Reply button from IM toasts
 and open IM window just by click on IM toast).

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_instant_message.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 1e570bf207..ccd754ac5e 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- height="175"
+ height="152"
  label="im_panel"
  layout="topleft"
  left="0"
@@ -83,13 +83,4 @@
      width="285"
      word_wrap="true"
      max_length="350" />
-    <button
-     follows="bottom"
-     height="23"
-     label="Reply"
-     layout="topleft"
-     left="100"
-     name="reply"
-     top="144"
-     width="100" />
 </panel>
-- 
cgit v1.2.3


From 22303da8a61e60dd061b5a63f6d023fd1345b59c Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 3 Dec 2009 13:48:07 +0200
Subject: Work on task EXT-3081 (Separate Message Well on Notifications Well
 and IM Well) Initial commit  -- added two floater classes derived from
 LLSysWellWindow to work with Notification Well & IM Well  -- register two
 floaters in place of previous sys_well (but with the same xml file)  --
 replace using of LLSysWellWindow with LLNotificationWellWindow in the out
 code (except of in LLScreenChannel::updateShowToastsState)  -- rename member
 variable in bottom tray used for Notification Well

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index ec3f7ea7c5..9679d22e70 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -319,7 +319,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          layout="topleft"
          min_height="28"
          top="0"
-         name="sys_well_panel"
+         name="notification_well_panel"
          width="54"
          min_width="54"
          user_resize="false">
@@ -328,7 +328,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              height="23"
              layout="topleft"
              left="0"
-             name="sys_well"
+             name="notification_well"
              top="4"
              width="54">
               <button
-- 
cgit v1.2.3


From 653ebfbe7ca53515d6c83f6ba72cbb1d3e2d9daf Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 4 Dec 2009 12:48:08 +0200
Subject: Work on normal task EXT-3081 (Separate Message Well on Notifications
 Well and IM Well) Refactored toggle interaction between Notification Well and
 Notification Well Window:  -- set "Button.SetDockableFloaterToggle" init
 callback to Notification Well  -- remove deprecated functionality in code  --
 update interaction with screen channels to work properly.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_sys_well.xml | 7 ++++---
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index be6d63716c..4e9388c2b2 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -6,19 +6,20 @@
  top="0" 
  follows="right|bottom"
  layout="topleft"
- name="notification_chiclet"
+ name="sys_well_window"
  help_topic="notification_chiclet"
  save_rect="true"
  title="NOTIFICATIONS" 
  width="320"
  min_width="320"
  height="23"
- can_minimize="true"
+ can_minimize="false"
  can_tear_off="false"
  can_resize="true"
  can_drag_on_left="false"
- can_close="false"
  can_dock="true"
+ save_visibility="true"
+ single_instance="true"
 >
     <flat_list_view
 	    color="FloaterDefaultBackgroundColor"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 9679d22e70..621dbdec61 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -346,8 +346,11 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
                image_overlay_alignment="right" 
                pad_right="6"
                pad_left="6"
-               width="54"
-               />
+               width="54" >
+                  <button.init_callback
+                   function="Button.SetDockableFloaterToggle"
+                   parameter="notification_well_window" />
+              </button>
 	    </chiclet_notification>
         </layout_panel>
        <icon
-- 
cgit v1.2.3


From 1acc52a7e781a7931d1fc6bfc2313c49eb6be2a2 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 4 Dec 2009 14:00:52 +0200
Subject: Work on normal task EXT-3081 (Separate Message Well on Notifications
 Well and IM Well)  -- removed member pointer to Notification Well Icon from
 the LLBottomTray  -- placed Well counter over the Icon, made center-aligned

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 621dbdec61..2796b4a1f7 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -320,8 +320,8 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          min_height="28"
          top="0"
          name="notification_well_panel"
-         width="54"
-         min_width="54"
+         width="34"
+         min_width="34"
          user_resize="false">
             <chiclet_notification
              follows="right"
@@ -330,23 +330,23 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              left="0"
              name="notification_well"
              top="4"
-             width="54">
+             width="34">
               <button
                  image_selected="PushButton_Selected_Press"
                  image_pressed="PushButton_Press"
 		 image_pressed_selected="PushButton_Selected_Press"
               auto_resize="true"
-               halign="right"
+               halign="center"
                height="23"
                follows="right"
                flash_color="EmphasisColor"
                left="0"
                name="Unread"
                image_overlay="Notices_Unread"
-               image_overlay_alignment="right" 
-               pad_right="6"
-               pad_left="6"
-               width="54" >
+               image_overlay_alignment="center" 
+               pad_right="0"
+               pad_left="0"
+               width="34" >
                   <button.init_callback
                    function="Button.SetDockableFloaterToggle"
                    parameter="notification_well_window" />
-- 
cgit v1.2.3


From 69cd9ac98bde4d602a8bdb785ac576df958ea1f5 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 4 Dec 2009 18:31:57 +0200
Subject: Completed normal task EXT-3081 (Separate Message Well on
 Notifications Well and IM Well)  -- created IM Wel icon  -- functionality is
 moved from the base class into appropriate classes (for Notification & IM
 Well windows)

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_bottomtray.xml      | 43 +++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 2796b4a1f7..7f847237ce 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -312,6 +312,47 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          min_width="4" 
          top="0"
          width="5"/>
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         top="0"
+         name="im_well_panel"
+         width="34"
+         min_width="34"
+         user_resize="false">
+            <chiclet_im_well
+             follows="right"
+             height="23"
+             layout="topleft"
+             left="0"
+             name="im_well"
+             top="4"
+             width="34">
+                <button
+                 auto_resize="true"
+                 flash_color="EmphasisColor"
+                 follows="right"
+                 halign="center"
+                 height="23"
+                 image_overlay="Notices_Unread"
+                 image_overlay_alignment="center" 
+                 image_pressed="PushButton_Press"
+                 image_pressed_selected="PushButton_Selected_Press"
+                 image_selected="PushButton_Selected_Press"
+                 left="0"
+                 name="Unread IM messages"
+                 pad_left="0"
+                 pad_right="0"
+                 width="34" >
+                    <button.init_callback
+                     function="Button.SetDockableFloaterToggle"
+                     parameter="im_well_window" />
+                </button>
+            </chiclet_im_well>
+        </layout_panel>
         <layout_panel
          auto_resize="false"
          follows="right"
@@ -353,7 +394,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
               </button>
 	    </chiclet_notification>
         </layout_panel>
-       <icon
+        <icon
          auto_resize="false"
          color="0 0 0 0"
          follows="left|right"
-- 
cgit v1.2.3


From 28a1ee9da8d58955590e3596409d2f49b130e1fc Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 4 Dec 2009 18:33:13 +0200
Subject: =?UTF-8?q?implemented=20EXT-700=20=E2=80=9C"Offer"=20notification?=
 =?UTF-8?q?s=20should=20be=20accessible=20via=20chiclet=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f48cc6d4bf..0d7351395a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4499,14 +4499,14 @@ You don&apos;t have permission to copy this.
   <notification
    icon="notifytip.tga"
    name="InventoryAccepted"
-   type="notifytip">
+   type="offer">
 [NAME] received your inventory offer.
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="InventoryDeclined"
-   type="notifytip">
+   type="offer">
 [NAME] declined your inventory offer.
   </notification>
 
-- 
cgit v1.2.3


From 1a7013d5cf63006ff9f4d30b21c4f369915de332 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 4 Dec 2009 19:28:27 +0200
Subject: Implemented normal task EXT-2832 (Hide "undock" icon on the
 floaters).

--HG--
branch : product-engine
---
 indra/newview/skins/default/textures/textures.xml      | 3 ---
 indra/newview/skins/default/xui/en/strings.xml         | 1 -
 indra/newview/skins/default/xui/en/widgets/floater.xml | 2 --
 3 files changed, 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index fbb910b847..771726d466 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -204,9 +204,6 @@ with the same filename but different name
   <texture name="Icon_Restore_Foreground" file_name="windows/Icon_Restore_Foreground.png" preload="false" />
   <texture name="Icon_Restore_Press" file_name="windows/Icon_Restore_Press.png" preload="false" />
 
-  <texture name="Icon_Undock_Foreground" file_name="windows/Icon_Undock_Foreground.png" preload="false" />
-  <texture name="Icon_Undock_Press" file_name="windows/Icon_Undock_Press.png" preload="false" />
-
   <texture name="Info" file_name="icons/Info.png" preload="false" />
   <texture name="Info_Small" file_name="icons/Info_Small.png" preload="false" />
   <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e47ec1ebda..194e359e10 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -88,7 +88,6 @@
 	<string name="BUTTON_MINIMIZE">Minimize</string>
 	<string name="BUTTON_TEAR_OFF">Tear Off</string>
 	<string name="BUTTON_DOCK">Dock</string>
-	<string name="BUTTON_UNDOCK">Undock</string>
 	<string name="BUTTON_HELP">Show Help</string>
 
 	<!-- searching - generic -->
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 2263866471..70ee9fc3b8 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -13,13 +13,11 @@
   minimize_image="Icon_Minimize_Foreground"
   tear_off_image="tearoffbox.tga"
   dock_image="Icon_Dock_Foreground"
-  undock_image="Icon_Undock_Foreground"
   help_image="Icon_Help_Foreground"
   close_pressed_image="Icon_Close_Press"
   restore_pressed_image="Icon_Restore_Press"
   minimize_pressed_image="Icon_Minimize_Press"
   tear_off_pressed_image="tearoff_pressed.tga"
   dock_pressed_image="Icon_Dock_Press"
-  undock_pressed_image="Icon_Undock_Press"
   help_pressed_image="Icon_Help_Press"
   />
-- 
cgit v1.2.3


From c28fd45839b0a1924c80bc289a90e4756e677472 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Fri, 4 Dec 2009 20:46:04 +0200
Subject: omg fix for two omg crtical bugs... EXT-3109 Viewer crashes when
 attempting to select group role EXT-3130 Viewer crashes after pressing "New
 Role" button in group profile also a bit fix layout

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 5bae5c2711..a5bab3232c 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -367,7 +367,7 @@ things in this group. There&apos;s a broad variety of Abilities.
         <text_editor
          type="string"
          halign="left"
-         height="50"
+         height="35"
          layout="topleft"
          left="0"
          max_length="295"
@@ -424,6 +424,10 @@ things in this group. There&apos;s a broad variety of Abilities.
          tool_tip="For details of each allowed ability see the abilities tab"
          top_pad="0"
          width="300">
+            <scroll_list.columns
+             label=""
+             name="icon"
+             width="2" />
             <scroll_list.columns
              label=""
              name="checkbox"
-- 
cgit v1.2.3


From fdb25e5add7305d8b92067f610eff1b5c18482de Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 7 Dec 2009 14:20:33 +0200
Subject: Aditional changes for normal task EXT-3081 (Separate Message Well on
 Notifications Well and IM Well)  -- set different titles for IM &
 Notification Well windows  -- set different anchors for IM & Notification
 Well windows

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index 4e9388c2b2..3fc57372de 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -21,6 +21,15 @@
  save_visibility="true"
  single_instance="true"
 >
+    <string
+     name="title_im_well_window">
+        IM SESSIONS
+    </string>
+    <string
+     name="title_notification_well_window">
+        NOTIFICATIONS
+    </string>
+     
     <flat_list_view
 	    color="FloaterDefaultBackgroundColor"
 	    follows="all"
-- 
cgit v1.2.3


From 0a617f15a83262ab472ca88f146c57bb0f6a6a73 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Mon, 7 Dec 2009 15:15:41 +0200
Subject: =?UTF-8?q?implemented=20EXT-2797=20=E2=80=9CMaking=20friendship?=
 =?UTF-8?q?=20offer=20should=20be=20recorded=20into=20IM=20history?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0d7351395a..c4946b895e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5128,6 +5128,13 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
        text="Decline"/>
     </form>
   </notification>
+  
+  <notification
+   icon="notify.tga"
+   name="FriendshipOffered"
+   type="offer">
+	You have offered friendship to [TO_NAME]
+  </notification>
 
   <notification
    icon="notify.tga"
-- 
cgit v1.2.3


From c3a82913deb9b23ef1f22b6d002893b36146553a Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Mon, 7 Dec 2009 22:44:44 +0200
Subject: Fixed normal bug EXT-3018([BSI] Hook up "Go to My Dashboard" in
 Profile to link to http://secondlife.com/my)

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index a833ad97d9..bbf86089cb 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -50,6 +50,10 @@
     name="partner_edit_link_url">
        http://www.secondlife.com/account/partners.php?lang=en
    </string>
+   <string
+    name="my_account_link_url">
+       http://secondlife.com/my
+   </string>
    <string
     name="no_partner_text"
     value="None" />
@@ -256,7 +260,7 @@
          layout="topleft"
          left="10"
          name="my_account_link"
-	 value="Go to My Dashboard"
+         value="[[URL] Go to My Dashboard]"
          width="285" />
         <text
          follows="left|top|right"
-- 
cgit v1.2.3