summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/textures/widgets/track_control_moon_back.pngbin859 -> 913 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/track_control_moon_front.pngbin1100 -> 1156 bytes
-rw-r--r--indra/newview/skins/default/xui/en/floater_my_environments.xml6
-rw-r--r--indra/newview/skins/default/xui/en/floater_settings_picker.xml33
4 files changed, 18 insertions, 21 deletions
diff --git a/indra/newview/skins/default/textures/widgets/track_control_moon_back.png b/indra/newview/skins/default/textures/widgets/track_control_moon_back.png
index 73d24e53f6..30f538d35b 100644
--- a/indra/newview/skins/default/textures/widgets/track_control_moon_back.png
+++ b/indra/newview/skins/default/textures/widgets/track_control_moon_back.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/track_control_moon_front.png b/indra/newview/skins/default/textures/widgets/track_control_moon_front.png
index 64def00772..d3882c5e4c 100644
--- a/indra/newview/skins/default/textures/widgets/track_control_moon_front.png
+++ b/indra/newview/skins/default/textures/widgets/track_control_moon_front.png
Binary files differ
diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index dd05dd5a20..a11a2c1200 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -125,8 +125,8 @@
label="Show Empty Folders"
layout="topleft"
name="chk_showfolders"
- top="0"
- left_delta="-3"
+ top="2"
+ left_delta="-1"
width="200" />
</layout_panel>
<layout_panel
@@ -139,7 +139,7 @@
<panel
background_visible="true"
bevel_style="none"
- top_pad="0"
+ top_pad="1"
follows="top|left|right"
height="30"
label="bottom_panel"
diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 2258a1dc24..2862d1ae37 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -29,8 +29,6 @@
left="6"
right="-6"
bottom="-10"
- auto_resize="true"
- user_resize="true"
orientation="vertical">
<layout_panel name="temp"
border="false"
@@ -49,30 +47,29 @@
name="flt_inventory_search"
top="4"
right="-2" />
- <inventory_panel
+ <panel
+ name="pnl_inv_wrap"
+ follows="all"
+ layout="topleft"
+ left="2"
+ top="2"
+ right="-2"
+ bottom="-2"
+ background_visible="true"
+ bg_alpha_color="DkGray2">
+ <inventory_panel
allow_multi_select="false"
suppress_folder_menu="true"
bg_visible="true"
bg_alpha_color="DkGray2"
border="false"
- follows="left|top|right|bottom"
+ follows="all"
left_delta="0"
name="pnl_inventory"
- top="31"
+ top="1"
right="-4"
- bottom="-26"
- />
- <check_box
- follows="left|bottom"
- height="14"
- initial_value="false"
- label="Show folders"
- layout="topleft"
- name="chk_showfolders"
- top="-20"
- top_pad="0"
- left_delta="-3"
- width="200" />
+ bottom="-1" />
+ </panel>
</layout_panel>
<layout_panel name="temp"
border="false"