summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2019-11-08 17:31:59 +0200
committermaxim_productengine <mnikolenko@productengine.com>2019-11-08 17:31:59 +0200
commitdd8128114c8cfe812e1dd8f2cfd449a4050d9aea (patch)
treef80f190fa2821b185728668fce960849ad06d609 /indra/newview/skins/default/xui
parentbf5ee32838b9d4c53ff1ab709e2935d8d0b4ec0b (diff)
SL-12186 WIP Minor updates for 'Camera controls' and 'Save preset' floaters
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml12
-rw-r--r--indra/newview/skins/default/xui/en/floater_save_pref_preset.xml17
2 files changed, 15 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
index 3826ead5c2..77e36f0b09 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
@@ -22,7 +22,7 @@
height="20"
label="X"
label_width="12"
- follows="topl|eft"
+ follows="top|left"
left="10"
name="camera_x"
top_pad="5"
@@ -37,7 +37,7 @@
height="20"
label="Y"
label_width="12"
- follows="topl|eft"
+ follows="top|left"
name="camera_y"
left_pad="20"
min_val="-1e+007"
@@ -51,7 +51,7 @@
height="20"
label="Z"
label_width="12"
- follows="topl|eft"
+ follows="top|left"
name="camera_z"
left_pad="20"
min_val="-1e+007"
@@ -75,7 +75,7 @@
height="20"
label="X"
label_width="12"
- follows="topl|eft"
+ follows="top|left"
left="10"
name="focus_x"
top_pad="5"
@@ -90,7 +90,7 @@
height="20"
label="Y"
label_width="12"
- follows="topl|eft"
+ follows="top|left"
name="focus_y"
left_pad="20"
min_val="-1e+007"
@@ -104,7 +104,7 @@
height="20"
label="Z"
label_width="12"
- follows="topl|eft"
+ follows="top|left"
name="focus_z"
left_pad="20"
min_val="-1e+007"
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
index 178ecad0f3..3a5838e846 100644
--- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -44,19 +44,12 @@
name="preset_txt_editor"
width="200"
top="45"/>
- <combo_box
- follows="top|left"
- layout="topleft"
- left="41"
- name="preset_combo"
- top_pad="35"
- width="200"/>
<button
follows="top|left"
height="25"
label="Save"
layout="topleft"
- top_delta="40"
+ top="145"
left="25"
name="save"
width="110"/>
@@ -68,4 +61,12 @@
left_pad="20"
name="cancel"
width="110"/>
+<!-- *HACK to correctly draw drop-down list over the buttons-->
+ <combo_box
+ follows="top|left"
+ layout="topleft"
+ left="41"
+ name="preset_combo"
+ top_delta="-40"
+ width="200"/>
</floater>