merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3

* Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790
* New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788
* EXT-272 - Draggable Landmarks
* EXT-715 - Block List Panel
* EXT-782 - Implement advanced place information accordions

1 files changed, 84 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
new file mode 100644
index 0000000000..5c8a8ee208
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ follows="left|top|right|bottom"
+ height="305"
+ layout="topleft"
+ name="block_list_panel"
+ min_height="350"
+ min_width="240"
+ width="280">
+    <text 
+     follows="top|left|right"
+     font="SansSerifHugeBold"
+     height="20"
+     layout="topleft"
+     left="10" 
+     name="title_text"
+     text_color="white"
+     top="0" 
+     width="250">
+        Blocked List
+     </text>
+     <button 
+     follows="top|right"
+     height="25"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back"
+     right="-9"
+     tab_stop="false" 
+     top="0"
+     width="25"/>
+    <scroll_list
+     follows="left|top|right|bottom"
+     height="200"
+     layout="topleft"
+     left="5"
+     name="blocked"
+     tool_tip="List of currently blocked residents"
+     top="30"
+     width="270" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Block Resident..."
+     label_selected="Block Resident..."
+     layout="topleft"
+     left_delta="0"
+     name="Block resident..."
+     tool_tip="Pick a resident to block"
+     top_pad="4"
+     width="210">
+        <button.commit_callback
+         function="Block.ClickPick" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Block object by name..."
+     label_selected="Block object by name..."
+     layout="topleft"
+     left_delta="0"
+     name="Block object by name..."
+     top_pad="4"
+     width="210" >
+        <button.commit_callback
+         function="Block.ClickBlockByName" />
+    </button>
+    <button
+     enabled="false"
+     follows="left|bottom"
+     height="20"
+     label="Unblock"
+     label_selected="Unblock"
+     layout="topleft"
+     left_delta="0"
+     name="Unblock"
+     tool_tip="Remove resident or object from blocked list"
+     top_pad="4"
+     width="210" >
+        <button.commit_callback
+         function="Block.ClickRemove" />
+    </button>
+</panel>