From 0bf4b5f2222ffb8171be094613363427f3b8470a Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 12 Aug 2009 01:12:27 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll@1277
 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
 Fixes: EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280
 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343
 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360
 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396
 EXT-412 Other changes: Movement & Caemra controls work Profile and Me panel
 refactoring Notification refactoring

---
 .../skins/default/xui/en/favorites_bar_button.xml  |  22 ++
 .../skins/default/xui/en/floater_avatar_picker.xml |   2 +-
 .../skins/default/xui/en/floater_sys_well.xml      |  99 +++++++++
 .../skins/default/xui/en/panel_bottomtray.xml      |   4 +-
 .../skins/default/xui/en/panel_group_general.xml   |   1 +
 .../default/xui/en/panel_group_info_sidetray.xml   |  88 ++++++++
 .../default/xui/en/panel_group_land_money.xml      |   4 +-
 .../skins/default/xui/en/panel_group_roles.xml     |  10 +-
 .../skins/default/xui/en/panel_navigation_bar.xml  | 230 +++++++++++----------
 .../newview/skins/default/xui/en/panel_people.xml  |   7 +-
 .../newview/skins/default/xui/en/panel_profile.xml |  21 +-
 .../skins/default/xui/en/panel_side_tray.xml       |  91 +-------
 .../skins/default/xui/en/panel_sys_well_item.xml   |  64 ++++++
 indra/newview/skins/default/xui/en/panel_toast.xml |  12 +-
 indra/newview/skins/default/xui/en/strings.xml     |   9 +-
 .../default/xui/en/widgets/location_input.xml      |   2 +-
 16 files changed, 448 insertions(+), 218 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/favorites_bar_button.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_sys_well.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_sys_well_item.xml

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

diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
new file mode 100644
index 0000000000..4525df31b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- *NOTE: mantipov: to use the "use_ellipses" attribute label should be LEFT aligned 
+untill LLFontGL::render() is fixed to avoid this requirement-->
+<!-- *NOTE: mantipov: top & height should be synchronized with <favorites_bar> in the panel_navigation_bar.xml-->
+<!-- All buttons in the Favorites bar will be created from this one -->
+<button
+ follows="left|bottom"
+ halign="left"
+ height="23"
+ image_disabled="transparent.j2c"
+ image_disabled_selected="PushButton_Selected"
+ image_hover_selected="PushButton_Selected"
+ image_hover_unselected="PushButton_Off"
+ image_selected="PushButton_Selected"
+ image_unselected="transparent.j2c"
+ layout="topleft"
+ left="2"
+ name="favorites_bar_btn"
+ tab_stop="false"
+ top="2"
+ use_ellipses="true"
+ width="120" />
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index 0012294160..b0472eb7e2 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -157,7 +157,7 @@
              label="Range"
              layout="topleft"
              left="10"
-             max_val="40"
+             max_val="130"
              min_val="5"
              name="near_me_range"
              top="32"
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
new file mode 100644
index 0000000000..468d41e2f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater 
+ background_opaque="false"
+ background_visible="true" 
+ bevel_style="in"
+ bg_alpha_color="0.0 0.0 0.0 0.0"
+ height="60"
+ left="0"
+ top="0" 
+ follows="right|bottom"
+ layout="topleft"
+ name="notification_chiclet"
+ save_rect="true"
+ title=""
+ width="320"
+ can_minimize="false"
+ can_tear_off="false"
+ can_resize="false"
+ can_drag_on_left="false"
+ can_close="false"
+ can_dock="false"
+>
+  <scroll_container
+   follows="top|bottom"
+   layout="topleft"
+   name="notification_list_container"
+   left="1"
+   top="30"
+   width="336"
+   height="30">
+    <scrolling_panel_list
+     follows="left|right"
+     layout="topleft"
+     name="notification_list"
+     left="0"
+     top="0"
+     height="20"
+     width="320" />
+  </scroll_container>
+
+  <panel 
+    top="0" 
+    width="320" 
+    height="30"
+    layout="topleft"
+    follows="top|left|right"
+    background_visible="true" 
+    background_opaque="false" 
+    bg_alpha_color="0.0 0.0 0.0 1.0" 
+    name="notification_caption"
+  >
+    <text
+      width="255" 
+      left="25" 
+      height="20" 
+      layout="topleft"
+      follows="left|right|top"
+      font="SansSerifBoldBig" 
+      text_color="white" 
+      word_wrap="true"
+      mouse_opaque="true" 
+      name="sender_name"
+    >
+      NOTIFICATIONS  
+    </text>
+    <button
+      top="5"
+      left="270"
+      width="15"
+      height="15"
+      layout="topleft"
+      follows="right"
+      label=""
+      toggle="true" 
+      image_unselected="arrow_up.tga"
+      image_disabled="arrow_up.tga"
+      image_selected="arrow_down.tga"
+      image_hover_selected="arrow_down.tga"
+      image_disabled_selected="arrow_down.tga"
+      name="tear_btn"
+    />    
+    <button 
+      top="5" 
+      left="300"
+      width="15" 
+      height="15"
+      layout="topleft"
+      follows="right"
+      label="" 
+      image_unselected="closebox.tga" 
+      image_disabled="closebox.tga"
+      image_selected="closebox.tga" 
+      image_hover_selected="closebox.tga"
+      image_disabled_selected="closebox.tga"
+      name="close_btn"
+    />
+  </panel>
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 4c880f6dc0..91039539f9 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -127,8 +127,8 @@
                 <split_button.item
                  image_selected="camera_presets/camera_presets_34_view.png"
                  image_unselected="camera_presets/camera_presets_34_view.png"
-                 name="3/4_view"
-                 tool_tip="3/4 View" 
+                 name="group_view"
+                 tool_tip="Group View" 
                 />
                 <split_button.item
                  image_selected="camera_presets/camera_presets_fron_view.png"
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index fcae65dd69..b9a384bf8f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -4,6 +4,7 @@
  follows="all"
  height="514"
  label="General"
+ class="panel_group_general"
  layout="topleft"
  left="1"
  name="general_tab"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
new file mode 100644
index 0000000000..4f179d7a16
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel
+ 	follows="left|top|right|bottom"
+	height="660"
+	label="Group Info"
+ 	layout="topleft"
+	name="panel_group_info"
+	border="false"
+	width="300">
+    <panel.string
+     name="default_needs_apply_text">
+        There are unapplied changes on the current tab.
+    </panel.string>
+    <panel.string
+     name="want_apply_text">
+        Do you want to apply these changes?
+    </panel.string>
+
+	<button 
+     layout="topleft" 
+     name="back" 
+     left="5" 
+     top="5" 
+     width="20" 
+     height="20" 
+     label=""
+     follows="top|left"
+     image_selected="navbar_bg_button.tga"
+     image_unselected="navbar_bg_button.tga"
+     image_overlay="navbar_back.tga"/>
+    <text 
+     layout="topleft" 
+     top="5" 
+     left_pad="15" 
+     width="200" 
+     height="20" 
+     font="SansSerifBold" 
+     text_color="white" 
+     follows="top|left|right"
+     mouse_opaque="true" 
+     name="group_name">(Loading...)</text>
+    <button
+     top="632"
+     height="20"
+     font="SansSerifSmall"
+     label="Apply"
+     label_selected="Apply"
+     name="btn_apply"
+     left="5"
+     width="65" />
+    <button
+	 top="632"
+	 left="75"	 
+	 height="20"
+     ont="SansSerifSmall"
+     label="Refresh"
+     label_selected="Refresh"
+     name="btn_refresh"
+	 follows="top|left"
+     width="65" />
+    <button
+     top="632"
+     height="20"
+     font="SansSerifSmall"
+     label="Create"
+     label_selected="Create"
+     name="btn_create"
+     left="5"
+     visible="false"
+     width="65" />
+      <accordion layout="topleft" left="2" width="296" top="28" height="600" follows="all" name="panel_me_profile">
+		<accordion_tab min_height="515" title="Group General" name="group_general_tab">
+        	<panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/>
+		</accordion_tab>
+		<accordion_tab min_height="380" title="Group Roles" name="group_roles_tab" can_resize="false">
+        	<panel class="panel_group_roles" filename="panel_group_roles.xml" name="group_roles_tab_panel"/>
+		</accordion_tab>
+		<accordion_tab min_height="530" title="Group Notices" name="group_notices_tab" can_resize="false">
+			<panel class="panel_group_notices" filename="panel_group_notices.xml" name="group_notices_tab_panel"/>
+		</accordion_tab>
+		<accordion_tab min_height="270" title="Group Land Money" name="group_land_tab" can_resize="false">
+			<panel class="panel_group_land_money" filename="panel_group_land_money.xml" name="group_land_tab_panel"/>
+		</accordion_tab>
+	  </accordion>
+
+
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index b96421ca2f..c52994b43d 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="514"
+ height="420"
  label="Land &amp; L$"
  layout="topleft"
  left="1"
@@ -281,7 +281,7 @@
              bg_readonly_color="0.784314 0.819608 0.8 1"
              follows="all"
              font="Monospace"
-             height="150"
+             height="180"
              layout="topleft"
              left="8"
              max_length="4096"
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 dd6cd8c95e..132c06d028 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="true"
- height="530"
+ height="380"
  label="Members &amp; Roles"
  layout="topleft"
  left="1"
  name="roles_tab"
- top="530"
  width="280">
     <panel.string
      name="default_needs_apply_text">
@@ -31,7 +30,7 @@
     -->
     <panel
      follows="left|top"
-     height="24"
+     height="80"
      layout="topleft"
      left="10"
      name="members_header"
@@ -174,7 +173,7 @@
      left_delta="0"
      name="roles_tab_container"
      tab_position="top"
-     top="70"
+     top="80"
      width="265">
         <panel
          border="true"
@@ -185,6 +184,7 @@
          name="members_sub_tab"
          tool_tip="Members"
          top="16"
+         class="panel_group_members_subtab"
          width="265">
             <panel.string
              name="help_text">
@@ -279,6 +279,7 @@ clicking on their names.
          layout="topleft"
          left_delta="0"
          name="roles_sub_tab"
+         class="panel_group_roles_subtab"
          top_delta="0"
          width="265">
             <panel.string
@@ -384,6 +385,7 @@ including the Everyone and Owner Roles.
          layout="topleft"
          left_delta="0"
          name="actions_sub_tab"
+         class="panel_group_actions_subtab"
          top_delta="0"
          width="265">
             <panel.string
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 4904a0d40a..8d90c6ebf0 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -8,118 +8,124 @@
  layout="topleft"
  name="navigation_bar"
  width="600">
-     <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="23"
-     image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled"
-     image_overlay="Arrow_Left_Off"
-     image_selected="PushButton_Selected"
-     image_unselected="PushButton_Off"
-     hover_glow_amount="0.15"
-     layout="topleft"
-     left="10"
-     name="back_btn"
-     picture_style="true"
-     tool_tip="Go back to previous location"
-     top="8"
-     width="31" />
-
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="23"
-     image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled"
-     image_overlay="Arrow_Right_Off"
-     image_selected="PushButton_Selected"
-     image_unselected="PushButton_Off"
-     hover_glow_amount="0.15"
-     layout="topleft"
-     left_pad="0"
-     name="forward_btn"
-     picture_style="true"
-     tool_tip="Go forward one location"
-     top_delta="0"
-     width="31" />
-    <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="23"
-     image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled"
-     image_overlay="Home_Off"
-     image_selected="PushButton_Selected"
-     image_unselected="PushButton_Off"
-     hover_glow_amount="0.15"
-     layout="topleft"
-     left_pad="7"
-     name="home_btn"
-     picture_style="true"
-     tool_tip="Teleport to your home location"
-     top_delta="0"
-     width="32" />
-    <location_input
-     follows="left|right|top"
-     halign="right"
-     height="22"
-     label="Location"
-     layout="topleft"
-     left_pad="7"
-     max_chars="254"
-     mouse_opaque="false"
-     name="location_combo"
-     top_delta="0"
-     width="266">
-     <!-- *TODO: Delete.  Let the location_input use the correct art sizes.
-        <location_input.add_landmark_button
-         height="18"
-         name="location_combo_add"
-         width="20" />
-        <location_input.info_button
-         height="18"
-         name="location_combo_info"
-         width="20" />
-      -->
-    </location_input>
-
-<!--     <button -->
-<!--      follows="right|top" -->
-<!--      height="20" -->
-<!--      image_disabled="TextField_Search_Off" -->
-<!--      image_disabled_selected="TextField_Search_Off" -->
-<!--      image_hover_selected="TextField_Search_Off" -->
-<!--      image_hover_unselected="TextField_Search_Off" -->
-<!--      image_selected="TextField_Search_Off" -->
-<!--      image_unselected="TextField_Search_Off" -->
-<!--      layout="topleft" -->
-<!--      left_pad="5" -->
-<!--      mouse_opaque="false" -->
-<!--      name="search_bg" -->
-<!--      picture_style="true" -->
-<!--      top_delta="0" -->
-<!--      width="168" /> -->
-    
-    <search_editor
-     bevel_style="none"
-     border_style="line"
-     border.border_thickness="0"
-     commit_on_focus_lost="false"
-     follows="right|top"
-     halign="right"
-     height="22"
-     label="Search All"
-     layout="topleft"
-     left_pad="7"
-     mouse_opaque="false"
-     name="search_input"
-     tool_tip="Search All"
-     top_delta="0"
-     width="200" /> 
-    
-    
-
+	<panel
+	 background_visible="false"
+	 follows="left|top|right"
+	 height="60"
+	 layout="topleft"
+	 name="navigation_panel"
+	 width="600">	 
+	     <button
+	     follows="left|top"
+	     font="SansSerifSmall"
+	     height="23"
+	     image_disabled="PushButton_Disabled"
+	     image_disabled_selected="PushButton_Disabled"
+	     image_overlay="Arrow_Left_Off"
+	     image_selected="PushButton_Selected"
+	     image_unselected="PushButton_Off"
+	     hover_glow_amount="0.15"
+	     layout="topleft"
+	     left="10"
+	     name="back_btn"
+	     picture_style="true"
+	     tool_tip="Go back to previous location"
+	     top="3"
+	     width="31" />
+	
+	    <button
+	     follows="left|top"
+	     font="SansSerifSmall"
+	     height="23"
+	     image_disabled="PushButton_Disabled"
+	     image_disabled_selected="PushButton_Disabled"
+	     image_overlay="Arrow_Right_Off"
+	     image_selected="PushButton_Selected"
+	     image_unselected="PushButton_Off"
+	     hover_glow_amount="0.15"
+	     layout="topleft"
+	     left_pad="0"
+	     name="forward_btn"
+	     picture_style="true"
+	     tool_tip="Go forward one location"
+	     top_delta="0"
+	     width="31" />
+	    <button
+	     follows="left|top"
+	     font="SansSerifSmall"
+	     height="23"
+	     image_disabled="PushButton_Disabled"
+	     image_disabled_selected="PushButton_Disabled"
+	     image_overlay="Home_Off"
+	     image_selected="PushButton_Selected"
+	     image_unselected="PushButton_Off"
+	     hover_glow_amount="0.15"
+	     layout="topleft"
+	     left_pad="7"
+	     name="home_btn"
+	     picture_style="true"
+	     tool_tip="Teleport to your home location"
+	     top_delta="0"
+	     width="32" />
+	    <location_input
+	     follows="left|right|top"
+	     halign="right"
+	     height="22"
+	     label="Location"
+	     layout="topleft"
+	     left_pad="7"
+	     max_chars="254"
+	     mouse_opaque="false"
+	     name="location_combo"
+	     top_delta="0"
+	     width="266">
+	     <!-- *TODO: Delete.  Let the location_input use the correct art sizes.
+	        <location_input.add_landmark_button
+	         height="18"
+	         name="location_combo_add"
+	         width="20" />
+	        <location_input.info_button
+	         height="18"
+	         name="location_combo_info"
+	         width="20" />
+	      -->
+	    </location_input>
+	
+	<!--     <button -->
+	<!--      follows="right|top" -->
+	<!--      height="20" -->
+	<!--      image_disabled="TextField_Search_Off" -->
+	<!--      image_disabled_selected="TextField_Search_Off" -->
+	<!--      image_hover_selected="TextField_Search_Off" -->
+	<!--      image_hover_unselected="TextField_Search_Off" -->
+	<!--      image_selected="TextField_Search_Off" -->
+	<!--      image_unselected="TextField_Search_Off" -->
+	<!--      layout="topleft" -->
+	<!--      left_pad="5" -->
+	<!--      mouse_opaque="false" -->
+	<!--      name="search_bg" -->
+	<!--      picture_style="true" -->
+	<!--      top_delta="0" -->
+	<!--      width="168" /> -->
+	    
+	    <search_editor
+	     bevel_style="none"
+	     border_style="line"
+	     border.border_thickness="0"
+	     commit_on_focus_lost="false"
+	     follows="right|top"
+	     halign="right"
+	     height="22"
+	     label="Search All"
+	     layout="topleft"
+	     left_pad="7"
+	     mouse_opaque="false"
+	     name="search_input"
+	     tool_tip="Search All"
+	     top_delta="0"
+	     width="200" />        
+	</panel>
+	
     <favorites_bar
      follows="left|right|top"
      height="25"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index dc12bb7239..bccc04e30c 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -20,7 +20,6 @@
     height="23"
     follows="left|top|right"
     max_length="270"
-    label="Filter People"
     name="filter_input"
     font="SansSerif"
     background_image="TextField_Search_Off"
@@ -494,4 +493,10 @@
   <string name="no_groups">
     No groups
   </string>
+  <string name="people_filter_label">
+    Filter People
+  </string>
+  <string name="groups_filter_label">
+    Filter Groups
+  </string>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 7d2f76da5e..2a49db8d4f 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -181,7 +181,7 @@
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
             </text>
                   </panel>
-            <text
+            <link
              type="string"
              follows="left|top|right"
              font="SansSerifSmall"
@@ -191,9 +191,10 @@
              left="10"
              name="homepage_edit"
              text_color="HTMLLinkColor"
+             hover_color="0.5 0.4 1 1"
              width="280">
                 TODO
-            </text>
+            </link>
             <text
              type="string"
              follows="left|top"
@@ -286,7 +287,7 @@
                  word_wrap="true">
                     [FIRST] [LAST]
                 </text>
-                <text
+                <link
                  type="string"
                  follows="top|right"
                  font="SansSerifSmall"
@@ -295,10 +296,11 @@
                  left_delta="0"
                  name="partner_edit_link"
                  text_color="HTMLLinkColor"
+                 hover_color="0.5 0.4 1 1"
                  top_delta="15"
                  width="40">
                     Edit
-                </text>
+                </link>
             </panel>
             <text
              type="string"
@@ -336,7 +338,7 @@
              top_pad="30"
              name="account_actions_panel"
              width="200">
-                <text
+                <link
                  type="string"
                  follows="left|top"
                  font="SansSerif"
@@ -345,12 +347,12 @@
                  left="0"
                  name="payment_update_link"
                  text_color="HTMLLinkColor"
+                 hover_color="0.5 0.4 1 1"
                  top="0"
                  width="100">
                     Update
-                </text>
-                <text
-                 type="string"
+                </link>
+                <link
                  follows="left|top"
                  font="SansSerif"
                  height="15"
@@ -358,10 +360,11 @@
                  left="70"
                  name="my_account_link"
                  text_color="HTMLLinkColor"
+                 hover_color="0.5 0.4 1 1"
                  top="0"
                  width="80">
                     My Account
-                </text>
+                </link>
             </panel-->
 
 
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 8953633276..a7b66d8555 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -50,9 +50,16 @@
         filename="panel_profile_view.xml"
         border="true"
       />
+      <panel 
+        class="panel_group_info_sidetray" 
+        name="panel_group_info_sidetray" 
+        filename="panel_group_info_sidetray.xml" 
+        label="Group Info" 
+        border="true"
+      />
+
     </panel_container>
   </sidetray_tab>
-  <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? -->
   <sidetray_tab 
     name="sidebar_places"
     tab_title="Places"
@@ -82,94 +89,14 @@
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
       <panel 
-        class="panel_me_profile" 
+        class="panel_me_profile_view" 
         name="panel_me_profile" 
         filename="panel_me_profile.xml"
         label="Me" 
         border="true"
       />
   </sidetray_tab>
-  
   <!--
-  <sidetray_tab 
-    name="sidebar_group"
-    mouse_opaque="false" 
-    background_visible="true" 
-    bg_opaque_color="0.5 0.5 0.5 1.0"
-    image="icn_voice-groupfocus.tga"
-    tab_title="Groups"
-    description="Manage Groups."
-  >
-    <accordion_tab 
-      name="group_accordion" 
-      title="Group General"
-      expanded="true"
-      collapsible="true" 
-      min_width="200" 
-      min_height="200" 
-      header_visible="true"
-    >
-      <panel 
-        class="panel_group_general" 
-        name="panel_group_general" 
-        filename="panel_group_general.xml" 
-        label="Group" 
-        border="true"
-      />
-    </accordion_tab>
-     <accordion_tab 
-      name="groupland_accordion" 
-      title="Group Land and Money"
-      expanded="false"
-      collapsible="true" 
-      min_width="200" 
-      min_height="200" 
-      header_visible="true"
-    >
-      <panel 
-        class="panel_group_land" 
-        name="panel_group_land" 
-        filename="panel_group_land_money.xml" 
-        label="Group" 
-        border="true"
-      />
-    </accordion_tab>
-     <accordion_tab 
-      name="groupnotices_accordion" 
-      title="Group Notices"
-      expanded="false"
-      collapsible="true" 
-      min_width="200" 
-      min_height="200" 
-      header_visible="true"
-    >
-      <panel 
-        class="panel_group_roles" 
-        name="panel_group_roles" 
-        filename="panel_group_roles.xml" 
-        label="Group" 
-        border="true"
-      />
-    </accordion_tab>
-     <accordion_tab 
-      name="grouproles_accordion" 
-      title="Group Roles"
-      expanded="false"
-      collapsible="true" 
-      min_width="200" 
-      min_height="200" 
-      header_visible="true"
-    >
-      <panel 
-        class="panel_group_roles" 
-        name="panel_group_roles" 
-        filename="panel_group_roles.xml" 
-        label="Group" 
-        border="true"
-      />
-    </accordion_tab>
-  </sidetray_tab>  
-  
 
  <sidetray_tab 	
     name="sidebar_previews" 
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
new file mode 100644
index 0000000000..eccb919b04
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+
+<panel
+	name="sys_well_item"
+	title="sys_well_item"
+  visible="false"
+  top="0" 
+  left="0" 
+	width="318"
+	height="35"
+  layout="topleft"
+  follows="top"
+  background_opaque="false"
+  background_visible="true"
+  bg_alpha_color="0.0 0.0 0.0 0.0" >
+
+  <icon
+    top="8"
+    left="8"
+    width="20"
+    height="20"
+    layout="topleft"
+    follows="left"
+    name="icon"
+    label=""
+    mouse_opaque="false"
+    image_name="lag_status_warning.tga" 
+    />
+
+  <text
+    top="2" 
+    left_pad="8" 
+    width="255" 
+    height="28" 
+    layout="topleft"
+    follows="right|left"
+    font="SansSerifBold" 
+    text_color="white"
+    use_ellipses="true" 
+    word_wrap="true"
+    mouse_opaque="false"
+    name="title" >
+    Select your streaming media preference. Select your streaming media preference.
+  </text>  
+  
+  <button
+    top="5" 
+    left_pad="5" 
+    width="15" 
+    height="15" 
+    layout="topleft"
+    follows="right"
+    name="close_btn" 
+    mouse_opaque="true"
+    label=""
+    image_unselected="toast_hide_btn.tga" 
+    image_disabled="toast_hide_btn.tga"
+    image_selected="toast_hide_btn.tga" 
+    image_hover_selected="toast_hide_btn.tga"
+    image_disabled_selected="toast_hide_btn.tga" 
+  />
+
+</panel> 
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index ba4915e074..f7d8cf948e 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- All our XML is utf-8 encoded. -->
 
-<panel
+<floater
 	name="toast"
-	title="toast"
+	title=""
   visible="false"
   layout="topleft"
 	width="350"
@@ -14,6 +14,12 @@
   background_opaque="true"
   background_visible="true"
   bevel_style="in"
+  can_minimize="false"
+  can_tear_off="false"
+  can_resize="false"
+  can_drag_on_left="false"
+  can_close="false"
+  can_dock="false"  
   bg_alpha_color="0.3 0.3 0.3 1.0">
 
   <text
@@ -62,4 +68,4 @@
     image_hover_selected="toast_hide_btn.tga"
     image_disabled_selected="toast_hide_btn.tga"
   />
-</panel> 
+</floater> 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fb3d3b4dea..ec4898448a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -320,7 +320,14 @@
 	<string name="GroupNotifyViewPastNotices">View past notices or opt-out of receiving these messages here.</string>
 	<string name="GroupNotifyOpenAttachment">Open Attachment</string>
 	<string name="GroupNotifySaveAttachment">Save Attachment</string>
-	
+  <string name="TeleportOffer">Teleport offering</string>
+  <!-- start-up toast's string-->
+  <string name="StartUpNotification">%d new notification arrived while you were away...</string>
+  <string name="StartUpNotifications">%d new notifications arrived while you were away...</string>
+  <!-- overflow toast's string-->
+  <string name="OverflowInfoChannelString">You have %d more notification</string>
+  
+  
 	<!-- body parts -->
 	<string name="BodyPartsRightArm">Right Arm</string>
 	<string name="BodyPartsHead">Head</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index eb9bb99b20..777651c452 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -42,7 +42,7 @@
   <combo_list bg_writeable_color="MenuDefaultBgColor"/>
   <combo_editor name="Combo Text Entry"
                 text_pad_left="20"
-                select_on_focus="true"
+                select_on_focus="false"
                 font="SansSerifSmall"
                 bevel_style="none"
                 border_style="line"
-- 
cgit v1.2.3