1 files changed, 133 insertions, 24 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 9ee80a37d7..7c7561f922 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -1,34 +1,143 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
    name="Landmarks"
-   bottom="0"
-   height="326"
+   top="0"
+   height="400"
+   layout="topleft" 
    left="0"
    width="380"
    border="true"
    background_visible="true"
    bg_alpha_color="DkGray2"
    follows="left|top|right|bottom">
-      <inventory_panel
-	 allow_multi_select="true"
-	 border="true"
-	 bottom="0"
-	 follows="left|top|right|bottom"
-	 height="326"
-	 left="0"
-	 mouse_opaque="true"
-	 name="landmarks_list"
-	 width="380"/>
-      <button
-	 bottom="0"
-	 halign="center"
-	 height="16"
-	 label=">"
-	 enabled="false"
-	 mouse_opaque="false"
-	 name="selector"
-	 width="20"
-	 left="0"
-	 follows="right|bottom"
-	 tool_tip="View landmark properties"/>
+    <accordion
+     follows="left|top|right|bottom"
+     height="368"
+     layout="topleft"
+     left="0"
+     name="landmarks_accordion"
+     top="2"
+     width="380">
+        <accordion_tab
+         layout="topleft"
+         name="tab_favorites"
+         title="Favorites bar">
+            <inventory_subtree_panel
+             allow_multi_select="true"
+             border="true"
+             bottom="0"
+             follows="left|top|right|bottom"
+             height="126"
+             left="0"
+             mouse_opaque="true"
+             name="favorites_list"
+             width="380"/>
+        </accordion_tab>
+        <accordion_tab
+         layout="topleft"
+         name="tab_landmarks"
+         title="Landmarks">
+            <inventory_subtree_panel
+             allow_multi_select="true"
+             border="true"
+             bottom="0"
+             follows="left|top|right|bottom"
+             height="126"
+             left="0"
+             mouse_opaque="true"
+             name="landmarks_list"
+             start_folder="landmark"
+             width="380"/>
+        </accordion_tab>
+        <accordion_tab
+         layout="topleft"
+         name="tab_inventory"
+         title="My Inventory">
+            <inventory_subtree_panel
+             allow_multi_select="true"
+             border="true"
+             bottom="0"
+             follows="left|top|right|bottom"
+             height="126"
+             left="0"
+             mouse_opaque="true"
+             name="my_inventory_list"
+             width="380"/>
+        </accordion_tab>
+        <accordion_tab
+         layout="topleft"
+         name="tab_library"
+         title="Library">
+            <inventory_subtree_panel
+             allow_multi_select="true"
+             border="true"
+             bottom="0"
+             follows="left|top|right|bottom"
+             height="120"
+             left="0"
+             mouse_opaque="true"
+             name="library_list"
+             width="380"/>
+        </accordion_tab>
+    </accordion>
+    <panel
+     background_visible="true"
+     bevel_style="none"
+     bottom="0"
+     follows="left|right|bottom"
+     height="30"
+     layout="bottomleft"
+     left="0"
+     name="bottom_panel"
+     width="380">
+        <button
+         follows="bottom|left"
+         tool_tip="Show additional options"
+         height="18"
+         image_disabled="OptionsMenu_Disabled"
+         image_selected="OptionsMenu_Press"
+         image_unselected="OptionsMenu_Off"
+         layout="topleft"
+         left="10"
+         name="options_gear_btn"
+         picture_style="true"
+         top="6"
+         width="18" />
+        <button
+         follows="bottom|left"
+         height="18"
+         image_selected="AddItem_Press"
+         image_unselected="AddItem_Off"
+         image_disabled="AddItem_Disabled"
+         layout="topleft"
+         left_pad="5"
+         name="add_landmark_btn"
+         picture_style="true"
+         tool_tip="Add New Landmark"
+         width="18" />
+        <button
+         follows="bottom|left"
+         height="18"
+         image_selected="AddItem_Press"
+         image_unselected="AddItem_Off"
+         image_disabled="AddItem_Disabled"
+         layout="topleft"
+         left_pad="5"
+         name="add_folder_btn"
+         picture_style="true"
+         tool_tip="Add New Folder"
+         width="18" />
+        <button
+         follows="bottom|right"
+         height="18"
+         image_selected="TrashItem_Press"
+         image_unselected="TrashItem_Off"
+         layout="topleft"
+         right="-5"
+         name="trash_btn"
+         picture_style="true"
+         tool_tip="Remove selected Landmark"
+         top="6"
+         width="18" />
+    </panel>
 </panel>