diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-11-03 11:15:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-11-03 11:15:27 -0500 |
| commit | c86efd6c03a0de1d593006787a1850d49bb7e726 (patch) | |
| tree | 345ecaf00e7cc03989d9b7223855e22c5ec5776c | |
| parent | 70721bae390ab49ff24022c5c8f75bc274adc8c8 (diff) | |
| parent | 02aec10e555adcd0ffeb4dcfd4dc7a77d12d7dd5 (diff) | |
Merge branch 'DRTVWR-559' of ssh://github.com/secondlife/viewer into DRTVWR-559
| -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 |