summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-03-30 18:32:42 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-03-30 18:35:47 +0300
commit8f6d149fadf635f6698e2e68aa4f48db13eff648 (patch)
treea86adf0a7c38c4d0ced579ed364187a26af7f9d9 /indra/newview/skins
parentcd61dbe6eea8d9a7e4bdb594179bafc24a504146 (diff)
SL-16937 New Profile capability, image uploader for testing
This commit is mostly to simplify cap testing for server side. Plan is to remove LLLocalBitmap and draw texture more directly instead
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile_secondlife.xml17
1 files changed, 7 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 816b0b8f5c..d8d2749a2b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -177,19 +177,16 @@
auto_resize="false"
user_resize="false"
>
- <!-- 23 pixels (BTN_HEIGHT_SMALL) are reserved by label field of texture and shouldn't be visible-->
- <texture_picker
+
+ <icon
name="2nd_life_pic"
+ image_name="Generic_Person_Large"
+ layout="topleft"
+ follows="all"
top="0"
left="0"
- right="-1"
- height="180"
- follows="all"
- layout="topleft"
- allow_no_texture="true"
- default_image_name="None"
- fallback_image="Generic_Person_Large"
- />
+ width="157"
+ height="157"/>
</layout_panel>
<layout_panel
name="label_stack"