merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r 1078-1091 -> viewer-2.0.0-3

8 files changed, 197 insertions, 65 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index afac4a4051..3052571b1e 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -28,5 +28,5 @@
       		color="1 1 1 1" enabled="true" image_name="closebox.tga"
       		name="close_btn"/>
 	</panel>
-  <chat_history_view bottom="0" width="250" height="320" follows="left|right|top|bottom" name="chat_scroll" />
+  <chat_items_container bottom="0" width="250" height="320" follows="left|right|top|bottom" name="chat_history" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
index 5eb4b10af9..02a2f83d14 100644
--- a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
      mouse_opaque="false" name="NearBy Chat Menu" opaque="true" width="128" visible="false">
-	<menu_item_call bottom_delta="-18" height="18" label="Keep Visible" left="0" mouse_opaque="true"
-	     name="keep_visible" width="128">
-    <menu_item_call.on_click function="NearbyChat.Action" userdata="keep_visible" />
-	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="Show Nearby People..." left="0" mouse_opaque="true"
 	     name="nearby_people" width="128">
     <menu_item_call.on_click function="NearbyChat.Action" userdata="nearby_people" />
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 7006203dcd..7ac068df4b 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -301,9 +301,11 @@
                height="20"
                left="22"
                top="23"/>
+<!-- 
 			  <chiclet_notification.commit_callback
 				 function="Notification.Show"
 				 parameter="ClickUnimplemented" />
+ -->               				 
 			</chiclet_notification>
         </layout_panel>
         <icon
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
new file mode 100644
index 0000000000..b628ee3aa1
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+
+<panel
+  name="instant_message"
+  width="300"
+  height="180"
+  background_opaque="false"
+  background_visible="true"
+  follows="left|top|right|bottom"
+  bg_alpha_color="0.3 0.3 0.3 1.0">
+	<panel width="250" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="msg_caption">
+  		<avatar_icon
+      		top="25" left="10" width="20" height="20" follows="left|top"
+      		color="1 1 1 1" enabled="true" name="avatar_icon"
+		  />
+    	<text
+        	width="160" top="25" left="40" height="20" follows="left|right|top"
+        	font="SansSerifBigBold" text_color="white" word_wrap="true"
+        	mouse_opaque="true" name="sender_name" >
+	      Jerry Knight
+    	</text>
+    	<icon top="22" left="170" width="15" height="15" follows="top|right"
+      		image_name="icn_voice-pvtfocus.tga" visible="false" name="msg_inspector"/>
+    	<icon top="22" left="190" width="10" height="10" follows="top|right"
+      		image_name="speaking_indicator.tga"	name="msg_icon"/>
+    	<text width="35" top="22" left="205" height="20" follows="right|top"
+        		text_color="white" word_wrap="true" mouse_opaque="true" name="msg_time" >
+      		10:32
+		</text>
+	</panel>
+	<text_chat
+      top="-35" left="10" right="-10" height="120" follows="left|right|bottom"
+      font="SansSerifSmall" text_color="white" word_wrap="true"
+      mouse_opaque="true" name="msg_text" >    
+	</text_chat>
+</panel>
+
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
new file mode 100644
index 0000000000..1757197372
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel background_visible="true" bevel_style="in" bg_alpha_color="0 0 0 0"
+	height="200" label="instant_message" layout="topleft" left="0"
+	name="panel_group_notify" top="0" width="350">
+	<panel background_visible="true" bevel_style="in" bg_alpha_color="black"
+		height="50" label="header" layout="topleft" left="0" name="header"
+		top="0" width="350">
+		<icon follows="left|top|right|bottom" height="40"  width="40" layout="topleft"
+			top="5"  left="5" mouse_opaque="true" name="group_icon"/>
+		<text type="string" length="1" follows="left|top|right|bottom"
+			font="SansSerifBigBold" height="20" layout="topleft" left="60" name="title"
+			text_color="white" top="20" width="300">
+			Sender Name / Group Name
+        </text>
+	</panel>
+	<text_editor type="string" length="1" bg_readonly_color="0 0 0 0"
+		follows="left|top|right|bottom" height="70" hide_scrollbar="true"
+		hide_border="true" layout="topleft" top="55" left="25" name="message"
+		text_color="white" text_readonly_color="white" width="300" word_wrap="true">
+		Message
+		Body
+    </text_editor>
+	<text font="SansSerif" font.style="UNDERLINE" font_shadow="hard"
+		type="string" length="1" follows="left|top|right|bottom" layout="topleft"
+		left="25" top="135" height="15" width="300" name="attachment"
+		text_color="white">
+		Attachment
+        </text>
+	<button label="OK" layout="topleft" top="170" left="140" height="20"
+		width="70" name="btn_ok" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 366c3ecf6c..1743e016ee 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -81,7 +81,7 @@
      top_delta="0"
      width="60" />
     <button
-     enabled="false"
+     enabled="true"
      follows="bottom|right"
      font="SansSerifSmallBold"
      height="25"
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 01052f4bbe..76a92a1087 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -17,7 +17,7 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <accordionctrl_tab 
+    <accordion_tab 
       name="people_accordion" 
       title="People" 
       collapsable="true" 
@@ -35,7 +35,7 @@
         label="People" 
         border="true" 
       />
-    </accordionctrl_tab>
+    </accordion_tab>
   </sidetray_tab>
   <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? -->
   <sidetray_tab 
@@ -48,7 +48,7 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <accordionctrl_tab 
+    <accordion_tab 
       name="places_accordian" 
       title="Places" 
       collapsable="true" 
@@ -63,7 +63,7 @@
         label="Places" 
         border="true"
       />
-    </accordionctrl_tab>
+    </accordion_tab>
   </sidetray_tab>
   
   <sidetray_tab 
@@ -75,7 +75,7 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <accordionctrl_tab 
+    <accordion_tab 
       name="me_accordion" 
       title="Me" 
       collapsable="false" 
@@ -90,7 +90,7 @@
         label="Me" 
         border="true"
       />
-    </accordionctrl_tab>
+    </accordion_tab>
   </sidetray_tab>
   
   <!--
@@ -103,7 +103,7 @@
     tab_title="Groups"
     description="Manage Groups."
   >
-    <accordionctrl_tab 
+    <accordion_tab 
       name="group_accordion" 
       title="Group General"
       expanded="true"
@@ -119,8 +119,8 @@
         label="Group" 
         border="true"
       />
-    </accordionctrl_tab>
-     <accordionctrl_tab 
+    </accordion_tab>
+     <accordion_tab 
       name="groupland_accordion" 
       title="Group Land and Money"
       expanded="false"
@@ -136,8 +136,8 @@
         label="Group" 
         border="true"
       />
-    </accordionctrl_tab>
-     <accordionctrl_tab 
+    </accordion_tab>
+     <accordion_tab 
       name="groupnotices_accordion" 
       title="Group Notices"
       expanded="false"
@@ -153,8 +153,8 @@
         label="Group" 
         border="true"
       />
-    </accordionctrl_tab>
-     <accordionctrl_tab 
+    </accordion_tab>
+     <accordion_tab 
       name="grouproles_accordion" 
       title="Group Roles"
       expanded="false"
@@ -170,7 +170,7 @@
         label="Group" 
         border="true"
       />
-    </accordionctrl_tab>
+    </accordion_tab>
   </sidetray_tab>  
   
 
@@ -184,7 +184,7 @@
     tab_title="Previews"
     description="Previews."
   >
-    <accordionctrl_tab 
+    <accordion_tab 
       name="floater_preview_animation" 
       title="Preview Animation" 
       collapsable="true"
@@ -202,8 +202,8 @@
         label="Preview_Animation" 
         border="true" 
       />
-    </accordionctrl_tab>
-    <accordionctrl_tab 
+    </accordion_tab>
+    <accordion_tab 
       name="floater_preview_gesture" 
       title="Preview Gesture" 
       collapsable="true"
@@ -221,8 +221,8 @@
         label="Preview_Gesture" 
         border="true" 
       />
-    </accordionctrl_tab>
-    <accordionctrl_tab 
+    </accordion_tab>
+    <accordion_tab 
       name="floater_preview_existing_landmark" 
       title="Preview Existing Landmark" 
       collapsable="true"
@@ -240,8 +240,8 @@
         label="Preview_Existing_Landmark" 
         border="true" 
       />
-    </accordionctrl_tab>
-    <accordionctrl_tab 
+    </accordion_tab>
+    <accordion_tab 
       name="floater_preview_sound" 
       title="Preview Sound" 
       collapsable="true"
@@ -259,8 +259,8 @@
         label="Preview_Sound" 
         border="true" 
       />
-    </accordionctrl_tab>
-    <accordionctrl_tab 
+    </accordion_tab>
+    <accordion_tab 
       name="floater_preview_url" 
       title="Preview URL" 
       collapsable="true"
@@ -278,8 +278,8 @@
         label="Preview_URL" 
         border="true" 
       />
-    </accordionctrl_tab>
-    <accordionctrl_tab 
+    </accordion_tab>
+    <accordion_tab 
       name="floater_URL_entry" 
       title="URL Entry" 
       collapsable="true"
@@ -297,7 +297,7 @@
         label="URL_entry" 
         border="true" 
       />
-    </accordionctrl_tab>
+    </accordion_tab>
   </sidetray_tab>
 
   <sidetray_tab 	
@@ -310,7 +310,7 @@
     tab_title="Region"
     description="Region."
   >
-    <accordionctrl_tab 
+    <accordion_tab 
       name="panel_region_covenant" 
       title="Region Covenant" 
       collapsable="true" 
@@ -328,8 +328,8 @@
         label="Panel_Region_Covenant" 
         border="true" 
       />
-    </accordionctrl_tab>
-    <accordionctrl_tab 
+    </accordion_tab>
+    <accordion_tab 
       name="panel_region_debug" 
       title="Region Debug" 
       collapsable="true" 
@@ -347,8 +347,8 @@
         label="Panel_Region_Debug" 
         border="true" 
       />
-    </accordionctrl_tab>
-  <accordionctrl_tab 
+    </accordion_tab>
+  <accordion_tab 
       name="panel_region_estate" 
       title="Region Estate" 
       collapsable="true" 
@@ -366,8 +366,8 @@
         label="Panel_Region_Estate" 
         border="true" 
       />
-    </accordionctrl_tab>
-  <accordionctrl_tab 
+    </accordion_tab>
+  <accordion_tab 
       name="panel_region_general" 
       title="Region General" 
       collapsable="true" 
@@ -385,8 +385,8 @@
         label="Panel_Region_General" 
         border="true" 
       />
-    </accordionctrl_tab>
-  <accordionctrl_tab 
+    </accordion_tab>
+  <accordion_tab 
       name="panel_region_terrain" 
       title="Region Terrain" 
       collapsable="true" 
@@ -404,8 +404,8 @@
         label="Panel_Region_Terrain" 
         border="true" 
       />
-    </accordionctrl_tab>
-  <accordionctrl_tab 
+    </accordion_tab>
+  <accordion_tab 
       name="panel_region_texture" 
       title="Region Texture" 
       collapsable="true" 
@@ -423,8 +423,8 @@
         label="Panel_Region_Texture" 
         border="true" 
       />
-    </accordionctrl_tab>
-  <accordionctrl_tab 
+    </accordion_tab>
+  <accordion_tab 
       name="floater_region_info" 
       title="Region Info" 
       collapsable="true" 
@@ -442,7 +442,7 @@
         label="Floater_Region_Info" 
         border="true" 
       />
-    </accordionctrl_tab>
+    </accordion_tab>
   </sidetray_tab>
  
   <sidetray_tab 	
@@ -455,7 +455,7 @@
     tab_title="Build"
     description="Build"
   >
-    <accordionctrl_tab 
+    <accordion_tab 
       name="floater_tools" 
       title="Tools" 
       collapsable="true" 
@@ -473,8 +473,8 @@
         label="Tools" 
         border="true" 
       />
-    </accordionctrl_tab>
-    <accordionctrl_tab 
+    </accordion_tab>
+    <accordion_tab 
       name="floater_bulk_perms" 
       title="Bulk Perms" 
       collapsable="true" 
@@ -492,8 +492,8 @@
         label="Tools" 
         border="true" 
       />
-    </accordionctrl_tab>
-    <accordionctrl_tab 
+    </accordion_tab>
+    <accordion_tab 
       name="floater_build_options" 
       title="Build Options" 
       collapsable="true" 
@@ -511,7 +511,7 @@
         label="Tools" 
         border="true" 
       />
-    </accordionctrl_tab>
+    </accordion_tab>
     
   </sidetray_tab>
 
@@ -525,7 +525,7 @@
     tab_title="Other Tools"
     description="Other Tools"
   >
-    <accordionctrl_tab 
+    <accordion_tab 
       name="floater_gesture" 
       title="Gestures" 
       collapsable="true" 
@@ -543,9 +543,9 @@
         label="Gesture" 
         border="true" 
       />
-    </accordionctrl_tab>
+    </accordion_tab>
     
-    <accordionctrl_tab 
+    <accordion_tab 
       name="floater_buy_contents" 
       title="Buy Contents" 
       collapsable="true" 
@@ -563,8 +563,8 @@
         label="buy_contents" 
         border="true" 
       />
-    </accordionctrl_tab>
-    <accordionctrl_tab 
+    </accordion_tab>
+    <accordion_tab 
       name="floater_buy_object" 
       title="Buy Object" 
       collapsable="true" 
@@ -583,7 +583,7 @@
         border="true" 
       />
     </collapsible_ctrl>
-    <accordionctrl_tab 
+    <accordion_tab 
       name="floater_inventory_view_finder" 
       title="Inventory View Finder" 
       collapsable="true" 
@@ -601,8 +601,8 @@
         label="view_finder" 
         border="true" 
       />
-    </accordionctrl_tab>
-    <accordionctrl_tab 
+    </accordion_tab>
+    <accordion_tab 
       name="floater_mute" 
       title="Mute" 
       collapsable="true" 
@@ -620,8 +620,8 @@
         label="mute" 
         border="true" 
       />
-    </accordionctrl_tab>
-     <accordionctrl_tab 
+    </accordion_tab>
+     <accordion_tab 
       name="floater_sell_land" 
       title="Sell Land" 
       collapsable="true" 
@@ -639,8 +639,8 @@
         label="sell_land" 
         border="true" 
       />
-    </accordionctrl_tab>
-     <accordionctrl_tab 
+    </accordion_tab>
+     <accordion_tab 
       name="floater_telehub" 
       title="Telehub" 
       collapsable="true" 
@@ -658,7 +658,7 @@
         label="telehub" 
         border="true" 
       />
-    </accordionctrl_tab>
+    </accordion_tab>
     
   </sidetray_tab>
  --> 
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
new file mode 100644
index 0000000000..8952ea1307
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+
+<panel
+	name="toast"
+	title="toast"
+  visible="false"
+  layout="topleft"
+	width="350"
+	height="72"
+  left="100"
+  top="500"
+  follows="right|bottom" 
+  background_opaque="true"
+  background_visible="true"
+  bevel_style="in"
+  bg_alpha_color="0.3 0.3 0.3 1.0">
+
+  <text
+   type="string"
+   visible="false"
+   follows="left|top|right|bottom"
+   font="SansSerifBold"
+   height="40"
+   layout="topleft"
+   left="60"
+   name="text"
+   text_color="white"
+   top="30"
+   width="290">
+    Toast text;
+  </text>
+  <icon
+    top="20" 
+    left="10" 
+    width="32" 
+    height="32"
+    follows="top|left"
+    layout="topleft"
+    visible="false"
+    color="1 1 1 1" 
+    enabled="true" 
+    image_name="notify_tip_icon.tga"
+    mouse_opaque="true" 
+    name="icon"
+  />
+  <button
+    layout="topleft"
+    top="-5" 
+    left="335" 
+    width="20" 
+    height="20" 
+    follows="top|right"
+    visible="false" 
+    enabled="true" 
+    mouse_opaque="true" 
+    name="hide_btn" 
+    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>