diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 75c78d1ace4c59b84aee81c11655fd8b93ae6333..b9025ef7cdfb57fda5b4fb3ecc20123c8745488f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9017,7 +9017,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>RenderPerformanceTest</key> <map> diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 3f4e3e804f74d4d35e9b28b06627763189f48051..fe0199662383b321147c705a5aad6711a82cfcc2 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -152,7 +152,7 @@ top_pad="5" width="90"> <combo_box.item - label="Blinn-Phong" + label="Textures" name="Materials" value="Materials" /> <combo_box.item