From f58b17cb29ec85ef15465e3ede27cae9ae3b203f Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Wed, 15 May 2013 15:03:39 -0700
Subject: [PATCH] NORSPEC-152 better default norm/spec textures which read
better in the UI and provide better default spec feedback
---
indra/newview/app_settings/settings.xml | 15 ++-------------
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 b82da4c5ab9..e9b36ee5b16 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2872,17 +2872,6 @@
<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>
@@ -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 f8c05bd007f..302a4294e4c 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) );
--
GitLab