diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-15 15:03:39 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-15 15:03:39 -0700 |
| commit | f58b17cb29ec85ef15465e3ede27cae9ae3b203f (patch) | |
| tree | 86b6f869a19db72b70b6a3f41f5227f939e5a325 /indra/newview | |
| parent | 3c594c5d572a3aa998732c8a98fd0f8f5a4f4bcc (diff) | |
NORSPEC-152 better default norm/spec textures which read better in the UI and provide better default spec feedback
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 15 | ||||
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 1 |
2 files changed, 2 insertions, 14 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b82da4c5ab..e9b36ee5b1 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2873,17 +2873,6 @@ <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> @@ -2915,7 +2904,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>2d9dd1d8-9d57-3cfb-f965-f7613e702d8e</string> + <string>85f28839-7a1c-b4e3-d71d-967792970a7b</string> </map> <key>DefaultObjectSpecularTexture</key> <map> @@ -2926,7 +2915,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>e0491381-964c-0d68-1caa-91ab2f4c6d6a</string> + <string>87e0e8f7-8729-1ea8-cfc9-8915773009db</string> </map> <key>DefaultObjectTexture</key> <map> diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index f8c05bd007..302a4294e4 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -158,7 +158,6 @@ BOOL LLPanelFace::postBuild() if(mShinyTextureCtrl) { mShinyTextureCtrl->setDefaultImageAssetID(LLUUID( gSavedSettings.getString( "DefaultObjectSpecularTexture" ))); - mShinyTextureCtrl->setBlankImageAssetID(LLUUID( gSavedSettings.getString( "DefaultBlankSpecularTexture" ))); mShinyTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitSpecularTexture, this, _2) ); mShinyTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelSpecularTexture, this, _2) ); mShinyTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectSpecularTexture, this, _2) ); |