diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-23 22:22:41 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-23 22:22:41 +0000 |
| commit | 71d266e6d9c0e328f1a898b1233f686ea36577ba (patch) | |
| tree | 45afb0811ff260c71488a48ee5d0ff71dd2b48ed /indra/newview/skins/default/xui | |
| parent | a7570ae344cd4e2aeaf49b7770aa8a5e14d53863 (diff) | |
| parent | deac9ae7d84776d1f8497af82ed39e5d53e722d9 (diff) | |
Merged in andreykproductengine/maint-eep (pull request #232)
SL-1932 Day Cycle Edit feature "Load Track"
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_settings_picker.xml | 50 |
1 files changed, 42 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..55a1b540b4 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml @@ -14,13 +14,30 @@ <!-- top static --> <floater.string - name="choose_picture"> - Click to choose a picture - </floater.string> - <floater.string name="pick title"> Pick: </floater.string> + <floater.string + name="pick_track"> + SELECT TRACK + </floater.string> + <floater.string + name="pick_settings"> + SELECT SETTINGS + </floater.string> + + <floater.string + name="track_water"> + Water + </floater.string> + <floater.string + name="track_ground"> + Ground + </floater.string> + <floater.string + name="track_sky"> + Sky[NUM] + </floater.string> <layout_stack name="test_stack" follows="all" @@ -30,10 +47,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 +89,31 @@ 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"/> + </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" |