summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2014-11-11 17:46:17 +0200
committerandreykproductengine <akleshchev@productengine.com>2014-11-11 17:46:17 +0200
commite0425400ed151df2e9ccd4e2961e0d060695bd91 (patch)
tree862a66694c2b947f3ff65e813ed5d37439baa133 /indra/newview/skins/default/xui/en
parenta325ad8fbddf52e479ef1c86da59495e66aac679 (diff)
MAINT-4657 FIXED Objects can appear to have wrong 'for sale' type when viewed in inventory
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_inventory_item_properties.xml46
-rwxr-xr-xindra/newview/skins/default/xui/en/sidepanel_item_info.xml22
2 files changed, 24 insertions, 44 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index adef066aef..6667238232 100755
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -304,16 +304,20 @@
left_pad="5"
layout="topleft"
follows="left|top"
- name="combobox sale copy"
+ name="ComboBoxSaleType"
width="110">
- <combo_box.item
- label="Copy"
+ <combo_box.item
name="Copy"
- value="Copy" />
- <combo_box.item
- label="Original"
+ label="Copy"
+ value="2" />
+ <combo_box.item
+ name="Contents"
+ label="Contents"
+ value="3" />
+ <combo_box.item
name="Original"
- value="Original" />
+ label="Original"
+ value="1" />
</combo_box>
<spinner
follows="left|top"
@@ -427,34 +431,6 @@
Mark Item:
</text-->
-
- <!--radio_group
- draw_border="false"
- follows="left|top|right"
- height="16"
- layout="topleft"
- left_delta="78"
- name="RadioSaleType"
- top_delta="0"
- width="252">
- <radio_item
- height="16"
- label="Original"
- layout="topleft"
- left="0"
- name="radio"
- top="0"
- width="70" />
- <radio_item
- height="16"
- label="Copy"
- layout="topleft"
- left_delta="60"
- name="radio2"
- top_delta="0"
- width="70" />
- </radio_group-->
-
<!--text
type="string"
length="1"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index c5dfb703e5..9be01c5d4f 100755
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -395,16 +395,20 @@
left_pad="0"
layout="topleft"
follows="left|top"
- name="combobox sale copy"
+ name="ComboBoxSaleType"
width="170">
- <combo_box.item
- label="Copy"
- name="Copy"
- value="Copy" />
- <combo_box.item
- label="Original"
- name="Original"
- value="Original" />
+ <combo_box.item
+ name="Copy"
+ label="Copy"
+ value="2" />
+ <combo_box.item
+ name="Contents"
+ label="Contents"
+ value="3" />
+ <combo_box.item
+ name="Original"
+ label="Original"
+ value="1" />
</combo_box>
<spinner
follows="left|top"