diff options
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 18 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml index a6a401f43e..21ceeafeea 100644 --- a/indra/newview/skins/default/xui/en/floater_material_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml @@ -13,9 +13,6 @@ title="[MATERIAL_NAME]"> <string name="no_upload_fee_string">no upload fee</string> <string name="upload_fee_string">L$[FEE] upload fee</string> - <string name="material_selection_title">Material selection</string> - <string name="material_selection_text">Select material:</string> - <string name="material_batch_import_text">--- Bulk Upload All ---</string> <string name="material_override_title">Editing Material</string> <scroll_container diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index e81ff7f343..aeaa8370ac 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -684,6 +684,20 @@ function="Pref.RenderOptionUpdate" /> </check_box> + <check_box + control_name="RenderVintageMode" + height="16" + initial_value="false" + label="Vintage Mode" + layout="topleft" + left="420" + name="VintageMode" + top_delta="20" + width="240"> + <check_box.commit_callback + function="Pref.RenderOptionUpdate" /> + </check_box> + <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index ad68bd8d81..44da9a8dac 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4318,7 +4318,10 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string> <!-- PBR Materials --> <string name="Material Texture Name Header">Textures present this material: </string> - + <string name="material_selection_title">Material selection</string> + <string name="material_selection_text">Select material:</string> + <string name="material_batch_import_text">--- Bulk Upload All ---</string> + <!-- Conversation log messages --> <string name="logging_calls_disabled_log_empty"> Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat. |