diff options
Diffstat (limited to 'indra/newview/skins/default')
4 files changed, 17 insertions, 15 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml index 82a541d40d..b5de4166f6 100644 --- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml @@ -17,7 +17,10 @@ <string name="label_sky">Preset:</string> <string name="label_day_cycle">Day cycle:</string> - <string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string> + <string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string> + <string name="msg_sky_is_referenced">Cannot remove a preset that is referenced by some day cycle(s).</string> + + <string name="combo_label">-Select a preset-</string> <text follows="top|left|right" @@ -36,12 +39,7 @@ left_pad="10" name="preset_combo" top_delta="-5" - width="200"> - <combo_box.item - label="-Select a preset-" - name="item0" - value="any" /> - </combo_box> + width="200"/> <button follows="bottom|right" height="23" diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml index b93406053c..2c78d51c9f 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml @@ -39,6 +39,7 @@ follows="top|left" layout="topleft" left_pad="10" + max_chars="100" name="day_cycle_combo" top_delta="-5" width="200" /> diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml index 6ffb3480ad..64fbaf6b99 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml @@ -13,6 +13,7 @@ <string name="title_edit">Edit Sky Preset</string> <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string> <string name="hint_edit">To edit your sky preset, adjust the controls and click "Save".</string> + <string name="combo_label">-Select a preset-</string> <text follows="top|left|right" @@ -40,14 +41,16 @@ follows="top|left" layout="topleft" left_pad="10" + max_chars="100" name="sky_preset_combo" top_delta="-5" - width="200"> - <combo_box.item - label="-Select a preset-" - name="item0" - value="any" /> - </combo_box> + width="200"/> + <line_editor + height="20" + left_delta="0" + name="sky_preset_name" + top_delta="0" + width="200" /> <text follows="top|left|right" height="40" @@ -61,7 +64,6 @@ </text> <!--======== Controls panel ========--> <view_border - border="true" bevel_style="none" follows="top|left" height="225" @@ -1003,7 +1005,7 @@ label="Make this preset my new sky setting" layout="topleft" left="430" - name="new_water_preset_chb" + name="make_default_cb" top_pad="30" width="280"/> <button diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml index f107e67f74..77484bcfea 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml @@ -42,6 +42,7 @@ follows="top|left" layout="topleft" left_pad="10" + max_chars="100" name="water_preset_combo" top_delta="-5" width="200"> |