Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix

1 files changed, 138 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml
new file mode 100644
index 0000000000..c8293d3663
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_classified.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="bottom|left"
+ height="490"
+ label="Classified"
+ layout="topleft"
+ left="330"
+ name="Classified"
+ top="490"
+ width="450">
+    <panel.string
+     name="ad_placed_paid">
+        Ad placed: [DATE], Paid L$[AMT] for listing.
+    </panel.string>
+    <panel.string
+     name="update_txt">
+        Update
+    </panel.string>
+    <panel.string
+     name="publish_txt">
+        Publish...
+    </panel.string>
+    <panel.string
+     name="dateStr">
+        [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+    </panel.string>
+    <texture_picker
+     follows="left|top"
+     height="300"
+     layout="topleft"
+     left="20"
+     name="snapshot_ctrl"
+     top="15"
+     width="400" />
+    <line_editor
+     enabled="false"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="given_name_editor"
+     tool_tip="Name must begin with a letter or number, not punctuation"
+     top_delta="288"
+     width="400" />
+    <text_editor
+     enabled="false"
+     follows="left|top"
+     height="90"
+     layout="topleft"
+     left="20"
+     max_length="1023"
+     name="desc_editor"
+     width="400"
+     word_wrap="true" />
+    <line_editor
+     enabled="false"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="20"
+     name="location_editor"
+     tool_tip="Set the location for this classified to your current position"
+     width="400" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Set"
+     layout="topleft"
+     left_delta="360"
+     name="set_location_btn"
+     top_delta="0"
+     width="60" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Teleport"
+     layout="topleft"
+     left="20"
+     name="classified_teleport_btn"
+     top="449"
+     width="100" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Map"
+     layout="topleft"
+     left_pad="5"
+     name="classified_map_btn"
+     top_delta="0"
+     width="100" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Profile"
+     layout="topleft"
+     left_pad="5"
+     name="classified_profile_btn"
+     top_delta="0"
+     width="100" />
+    <combo_box
+     height="20"
+     layout="topleft"
+     left="30"
+     name="classified_mature_check"
+     top="48"
+     width="130">
+        <combo_box.item
+         label="- Select one -"
+         name="select_mature"
+         value="Select" />
+        <combo_box.item
+         label="Moderate Content"
+         name="mature"
+         value="Mature" />
+        <combo_box.item
+         label="General Content"
+         name="pg"
+         value="PG" />
+    </combo_box>
+    <combo_box
+     bottom="45"
+     height="18"
+     layout="topleft"
+     left="20"
+     name="classified_category_combo"
+     right="150" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Update"
+     layout="topleft"
+     left="30"
+     name="classified_update_btn"
+     top="70"
+     width="70" />
+</panel>