livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete setting FSSyncronizeTextureMaps

meow-7.2.2
Ansariel 2017-10-12 09:21:38 +02:00
parent e47355c008
commit 8a590c07c1
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -22793,17 +22793,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSSyncronizeTextureMaps</key>
<map>
<key>Comment</key>
<string>Deprecated - Leave this at ZERO and use SyncMaterialSettings instead. </string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<!-- <FS_Zi> Add avatar hitbox debug -->
<key>DebugRenderHitboxes</key>
<map>

7
indra/newview/llpanelface.cpp
View File

@ -2861,10 +2861,7 @@ void LLPanelFace::onClickMapsSync(LLUICtrl* ctrl, void *userdata)
LLPanelFace *self = (LLPanelFace*) userdata;
llassert_always(self);
self->getState();
// <FS:Beq> FIRE-21375 use LL setting name as part of the material sync changes (FIRE-21375)
// if (gSavedSettings.getBOOL("FSSyncronizeTextureMaps"))
if (gSavedSettings.getBOOL("SyncMaterialSettings"))
// </FS:Beq>
{
alignMaterialsProperties(self);
}
@ -2967,11 +2964,7 @@ void LLPanelFace::onCommitFlip(const LLUICtrl* ctrl, const LLSD& user_data)
{
case MATTYPE_DIFFUSE:
self->sendTextureInfo();
// <FS:Beq> FIRE-21375 use LL setting name as part of the material sync changes (FIRE-21375)
// if (gSavedSettings.getBOOL("FSSyncronizeTextureMaps"))
if (gSavedSettings.getBOOL("SyncMaterialSettings"))
// </FS:Beq>
{
alignMaterialsProperties(self);
}