diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-01-22 22:01:00 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-01-22 22:01:00 +0200 |
| commit | d693c5350933e664e5131c98babc7fbb2b4571aa (patch) | |
| tree | 4705289b336823901052c149e0e6dd1f94d03b4b /indra/newview/skins/default | |
| parent | a5392bb8e822b3f75559275b3ccef7d4c55b0f9d (diff) | |
SL-1932 Day Cycle Edit feature "Load Track" Part 1
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_settings_picker.xml | 46 |
1 files changed, 38 insertions, 8 deletions
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 7cc2c517ca..9ea949088f 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml @@ -14,10 +14,6 @@ <!-- top static --> <floater.string - name="choose_picture"> - Click to choose a picture - </floater.string> - <floater.string name="pick title"> Pick: </floater.string> @@ -30,10 +26,10 @@ right="-6" bottom="-10" orientation="vertical"> - <layout_panel name="temp" + <layout_panel name="inv_list" border="false" auto_resize="true" - user_resize="true" + user_resize="false" height="29" min_height="29" bg_alpha_color="blue" @@ -72,14 +68,48 @@ filter_asset_type="settings" /> </panel> </layout_panel> + <layout_panel name="pnl_combo" + border="false" + auto_resize="false" + user_resize="false" + visible="true" + height="29" + bg_alpha_color="blue" + background_visible="false"> + <combo_box + allow_text_entry="false" + follows="left|top" + height="23" + left="10" + max_chars="100" + mouse_opaque="true" + name="track_selection" + top="1" + width="190"> + <combo_box.item + label="Sky4" + name="Sky4" + value="4" /> + <combo_box.item + label="Sky3" + name="Sky3" + value="3" /> + <combo_box.item + label="Sky2" + name="Sky2" + value="2" /> + <combo_box.item + label="Ground" + name="Ground" + value="1" /> + </combo_box> + </layout_panel> <layout_panel name="temp" border="false" auto_resize="false" user_resize="false" height="29" min_height="29"> - <!-- bg_alpha_color="red" - background_visible="true" --> <button follows="top|left" height="20" |