merge -r 1649-1651 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3

Fixes: EXT-843 EXT-846
New Dev: EXT-514

1 files changed, 156 insertions, 6 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 82d6945e0f..70198dc626 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -1,12 +1,162 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Teleport History" bottom="0" height="326" left="0" width="380"
-     border="true" follows="left|top|right|bottom">
-	<scroll_list bottom="0" column_padding="0" draw_heading="false"
-	     draw_stripes="false" follows="left|top|bottom|right" left="0"
-	     multi_select="false" name="history_items" search_column="1"
-	     sort_column="1" height="326" width="380" >
+     border="true" follows="left|top|right|bottom">     
+    <accordion
+     follows="left|top|right|bottom"
+     height="326"
+     layout="topleft"
+     left="0"
+     top="0"
+     name="history_accordion"
+     width="380">
+
+	<accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="today"
+         title="Today">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="today_items"
+             top="0"
+             width="285">
 		<column name="landmark_icon" width="20" />
 		<column dynamic_width="true" label="Region" name="region" />
 		<column name="index" width="0" />
-	</scroll_list>
+	    </scroll_list>
+	</accordion_tab>     
+
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="yesterday"
+         title="Yesterday">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="yesterday_items"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="3_days_ago"
+         title="3 days ago">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="3_days_ago"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+     
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="4_days_ago"
+         title="4 days ago">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="4_days_ago"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+     
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="5_days_ago"
+         title="5 days ago">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="5_days_ago_items"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+     
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="6_days_ago"
+         title="6 days ago">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="6_days_ago"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+     
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="older_than_6_days"
+         title="Older than 6 days">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="older_than_6_days_items"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+     
+    </accordion>
+          
 </panel>