diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-14 05:59:48 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-14 05:59:48 -0700 |
| commit | c334a185f331a3392c2d0ccaf8241166ef9d8049 (patch) | |
| tree | 9be5040e58fd04ff867384fa4ea8e626e8df92f5 /indra/newview/app_settings/settings.xml | |
| parent | d9e8ee7cfd323872145c23e4032989f9b7770f55 (diff) | |
NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 47 |
1 files changed, 45 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2e53cf2da0..b82da4c5ab 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2862,6 +2862,28 @@ <key>Value</key> <integer>0</integer> </map> + <key>DefaultBlankNormalTexture</key> + <map> + <key>Comment</key> + <string>Texture used as 'Blank' in texture picker for normal maps. (UUID texture reference)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>5b53359e-59dd-d8a2-04c3-9e65134da47a</string> + </map> + <key>DefaultBlankSpecularTexture</key> + <map> + <key>Comment</key> + <string>Texture used as 'Blank' in texture picker for specular maps. (UUID texture reference)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>cd35472f-71fa-9b9c-8e73-a2c324f5751a</string> + </map> <key>DefaultFemaleAvatar</key> <map> <key>Comment</key> @@ -2884,8 +2906,29 @@ <key>Value</key> <string>Male Shape & Outfit</string> </map> - - <key>DefaultObjectTexture</key> + <key>DefaultObjectNormalTexture</key> + <map> + <key>Comment</key> + <string>Texture used as 'Default' in texture picker for normal map. (UUID texture reference)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>2d9dd1d8-9d57-3cfb-f965-f7613e702d8e</string> + </map> + <key>DefaultObjectSpecularTexture</key> + <map> + <key>Comment</key> + <string>Texture used as 'Default' in texture picker for specular map. (UUID texture reference)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>e0491381-964c-0d68-1caa-91ab2f4c6d6a</string> + </map> + <key>DefaultObjectTexture</key> <map> <key>Comment</key> <string>Texture used as 'Default' in texture picker. (UUID texture reference)</string> |