summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2010-03-04 12:18:24 +0200
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2010-03-04 12:18:24 +0200
commit5301d4189fde3332237b52ce26ab08f5c7fb0baa (patch)
tree2429f1f7678b4521962a071dc6263571901c2b19 /indra/newview/skins/default/xui
parentbb4e48e1d1eada7d0b6f94e7e693bd8341c15102 (diff)
Updated major sub task EXT-5858 - Assigned picture is stretched in the Classified Info panel.
Fixed reshape issues. Added stretching to edit classified panel. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_classified_info.xml14
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_classified.xml21
2 files changed, 27 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 869a05f27d..65c154daee 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -74,15 +74,25 @@
height="500"
left="0"
width="285">
+ <panel
+ name="snapshot_panel"
+ layout="topleft"
+ follows="left|top|right"
+ height="197"
+ left="10"
+ top="10"
+ width="275"
+ >
<texture_picker
enabled="false"
follows="left|top|right"
height="197"
layout="topleft"
- left="10"
+ left="0"
name="classified_snapshot"
- top="10"
+ top="0"
width="275" />
+ </panel>
<text_editor
allow_scroll="false"
bg_visible="false"
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 6cc6c51fe0..4fba0e5d90 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -62,24 +62,33 @@
height="690"
left="0"
width="285">
+ <panel
+ name="snapshot_panel"
+ layout="topleft"
+ follows="left|top|right"
+ height="197"
+ left="10"
+ top="10"
+ width="272">
<texture_picker
follows="left|top|right"
height="197"
width="272"
layout="topleft"
- top="10"
- left="11"
+ top="0"
+ left="0"
name="classified_snapshot" />
- <icon
+ <icon
height="197"
image_name="spacer24.tga"
layout="topleft"
name="edit_icon"
label=""
tool_tip="Click to select an image"
- top="10"
- left="11"
- width="286" />
+ top="0"
+ left="0"
+ width="272" />
+ </panel>
<text
type="string"
length="1"