summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-08 10:14:00 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-08 10:14:00 +0100
commitca5e05a5c763b8eba3c6441f0f931af27cc89542 (patch)
treedb0e22ff1e82f81edb822ee454b0fb130cf8ee3d /indra/newview/skins/default/xui
parentb9248bddec805a388772adb38ee707f1307861a6 (diff)
parent27b3005b788b969005f8b942024aacd29d16a674 (diff)
merge from PE's viewer-public
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/de/menu_cof_clothing.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_publish_classified.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_classified.xml28
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfit_edit.xml2
4 files changed, 33 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml
index 5cf31791ba..7fced273a7 100644
--- a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="COF Clothing">
<menu_item_call label="Ausziehen" name="take_off"/>
+ <menu_item_call label="Ersetzen" name="replace"/>
<menu_item_call label="Eine Kategorie nach oben" name="move_up"/>
<menu_item_call label="Eine Kategorie nach unten" name="move_down"/>
<menu_item_call label="Bearbeiten" name="edit"/>
diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
index f25c170f33..6ce9ed6e77 100644
--- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
@@ -25,10 +25,11 @@ Remember, Classified fees are non-refundable.
<spinner
decimal_digits="0"
follows="left|top"
+ font="SansSerif"
halign="left"
height="23"
increment="1"
- label_width="45"
+ label_width="50"
label="Price: L$ "
v_pad="10"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index cbdd548577..9408f193fd 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -261,6 +261,34 @@
name="auto_renew"
top_pad="15"
width="250" />
+ <text
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left="10"
+ name="price_for_listing_label"
+ text_color="white"
+ top_pad="15"
+ value="Price for listing:"
+ width="250" />
+ <spinner
+ decimal_digits="0"
+ follows="left|top"
+ halign="left"
+ height="23"
+ increment="1"
+ label_width="20"
+ label="L$"
+ v_pad="10"
+ layout="topleft"
+ left="10"
+ value="50"
+ min_val="50"
+ max_val="99999"
+ name="price_for_listing"
+ top_pad="5"
+ tool_tip="Price for listing."
+ width="105" />
</panel>
</scroll_container>
<panel
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index adc38b966c..cf174da2f0 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -406,6 +406,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
left_pad="1"
name="shop_btn_1"
top="1"
+ tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
width="31" />
</panel>
@@ -480,6 +481,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
left_pad="1"
name="shop_btn_2"
top="1"
+ tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
width="31" />
</panel>