move base back to default because doing it as a backout was causing merge errors

1 files changed, 147 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
new file mode 100644
index 0000000000..ecf5516390
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ follows="all"
+ height="570"
+ layout="topleft"
+ left="0"
+ min_height="350"
+ name="panel_pick_info"
+ help_topic="profile_pick_info"
+ top="0"
+ width="333">
+    <button
+     follows="top|right"
+     height="23"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back_btn"
+     left="12"
+     tab_stop="false"
+     top="2"
+     width="23" />
+    <text
+     follows="top|left|right"
+     font="SansSerifHugeBold"
+     height="26"
+     layout="topleft"
+     left_pad="10"
+     name="title"
+     text_color="LtGray"
+     top="0"
+     value="Pick Info"
+     use_ellipses="true"
+     width="275" />
+    <scroll_container
+     color="DkGray2"
+     opaque="true"
+     follows="all"
+     height="503"
+     layout="topleft"
+     left="8"
+     top_pad="10"
+     name="profile_scroll"
+     width="312">
+    <panel
+     name="scroll_content_panel"
+     follows="left|top|right"
+     min_height="300"
+     layout="topleft"
+     top="0"
+     background_visible="false"
+     height="400"
+     left="0"
+     width="285">
+        <texture_picker
+         enabled="false"
+         follows="left|top|right"
+         height="197"
+         layout="topleft"
+         left="11"
+         name="pick_snapshot"
+         top="10"
+         width="272" />
+        <text_editor
+         allow_scroll="false"
+         bg_visible="false"
+         follows="left|top|right"
+         h_pad="0"
+         height="35"
+         width="280"
+         layout="topleft"
+         font="SansSerifBig"
+         font.style="BOLD"
+         left="10"
+         top_pad="10"
+         name="pick_name"
+         read_only="true"
+         text_color="white"
+         v_pad="0"
+         value="[name]"
+         use_ellipses="true" />
+        <text_editor
+         allow_scroll="false"
+         bg_visible="false"
+         follows="left|top|right"
+         h_pad="0"
+         height="25"
+         layout="topleft"
+         left="10"
+         name="pick_location"
+         read_only="true"
+         width="280"
+         word_wrap="true"
+         v_pad="0"
+         value="[loading...]" />
+        <text_editor
+         bg_readonly_color="DkGray2"
+         follows="all"
+         height="100"
+         width="280"
+         allow_html="true"	
+         hide_scrollbar="false"
+         layout="topleft"
+         left="10"
+         top_pad="2"
+         max_length="1023"
+         name="pick_desc"
+         read_only="true"
+         text_readonly_color="white"
+         value="[description]"
+         wrap="true" />
+    </panel>
+    </scroll_container>
+    <panel
+     follows="left|right|bottom"
+     height="35"
+     layout="topleft"
+     top_pad="5"
+     left="8"
+     name="buttons">
+        <button
+         follows="bottom|left"
+         height="23"
+         label="Teleport"
+         layout="topleft"
+         left="0"
+         name="teleport_btn"
+         top="0"
+         width="101" />
+        <button
+         follows="bottom|left"
+         height="23"
+         label="Map"
+         layout="topleft"
+         left_pad="3"
+         name="show_on_map_btn"
+         width="100" />
+        <button
+         follows="bottom|left"
+         height="23"
+         label="Edit"
+         layout="topleft"
+         name="edit_btn"
+         left_pad="3"
+         width="101" />
+    </panel>
+</panel>