merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 147 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
new file mode 100644
index 0000000000..967cf2f539
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ bevel_style="in"
+ bg_alpha_color="0.2 0.2 0.2 1"
+ height="640"
+ label="Edit Pick"
+ layout="topleft"
+ left="0"
+ name="panel_edit_pick"
+ top="0"
+ width="355">
+    <text
+     type="string"
+     length="1"
+     follows="top"
+     font="SansSerifHugeBold"
+     height="15"
+     layout="topleft"
+     left="10"
+     name="title"
+     text_color="white"
+     top="0"
+     width="150">
+        Edit Pick
+    </text>
+    <panel
+     background_visible="true"
+     bg_alpha_color="0.5 0.5 0.5 1"
+     follows="left|right|top|bottom"
+     height="570"
+     layout="topleft"
+     left="10"
+     right="-10"
+     top="30">
+        <texture_picker
+         follows="left|top|right"
+         height="150"
+         layout="topleft"
+         left="10"
+         name="pick_snapshot"
+         right="-10"
+         top="10" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="16"
+         layout="topleft"
+         left="10"
+         name="Name:">
+            Name:
+        </text>
+        <line_editor
+         follows="left|top|right"
+         font="SansSerif"
+         height="20"
+         layout="topleft"
+         left="10"
+         name="pick_name"
+         right="-10"
+         width="290" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="30"
+         layout="topleft"
+         left="10"
+         name="description_label"
+         v_pad="15"
+         valign="center">
+            Description:
+        </text>
+        <text_editor
+         follows="left|top|right"
+         height="100"
+         layout="topleft"
+         left="10"
+         max_length="1023"
+         name="pick_desc"
+         right="-10"
+         word_wrap="true" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="20"
+         layout="topleft"
+         left="10"
+         name="description_label"
+         v_pad="15"
+         valign="bottom">
+            Location:
+        </text>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="50"
+         layout="topleft"
+         left="10"
+         name="pick_location"
+         right="-10"
+         v_pad="10"
+         valign="center"
+         word_wrap="true">
+            loading...
+        </text>
+        <button
+         follows="left|top"
+         height="20"
+         label="Set to Current Location"
+         layout="topleft"
+         left="10"
+         name="set_to_curr_location_btn"
+         width="200" />
+    </panel>
+    <panel
+     follows="right|bottom"
+     height="25"
+     label="bottom_panel"
+     layout="topleft"
+     left="5"
+     name="bottom_panel"
+     top="605"
+     width="345">
+        <button
+         follows="bottom|left"
+         height="20"
+         label="Save Changes"
+         layout="topleft"
+         name="save_changes_btn"
+         right="-120"
+         top="5"
+         width="130" />
+        <button
+         follows="bottom|left"
+         height="20"
+         label="Cancel"
+         layout="topleft"
+         name="cancel_btn"
+         right="-10"
+         top="5"
+         width="90" />
+    </panel>
+</panel>