diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-11-03 09:51:04 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-11-03 09:51:04 -0700 |
| commit | 89e4e6993f3cb11dd2206795c30834594880f52f (patch) | |
| tree | 520f5ac6bcd8f111b26e77f8c49840b331ce3ab1 /indra/newview | |
| parent | dfb44aec706532cd26a1fcc6415cc7fdadec9907 (diff) | |
| parent | c86efd6c03a0de1d593006787a1850d49bb7e726 (diff) | |
Merge branch brad/SL-19968-inventory-skel-background into 'origin/DRTVWR-559' (#489)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 75c78d1ace..b9025ef7cd 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 3f4e3e804f..fe01996623 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 |