diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d797abd906..3fe426a907 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -22793,17 +22793,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 - FSSyncronizeTextureMaps - - Comment - Deprecated - Leave this at ZERO and use SyncMaterialSettings instead. - Persist - 1 - Type - Boolean - Value - 0 - DebugRenderHitboxes diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 303a749bd0..e5b5e2c6d4 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -2861,10 +2861,7 @@ void LLPanelFace::onClickMapsSync(LLUICtrl* ctrl, void *userdata) LLPanelFace *self = (LLPanelFace*) userdata; llassert_always(self); self->getState(); - // FIRE-21375 use LL setting name as part of the material sync changes (FIRE-21375) - // if (gSavedSettings.getBOOL("FSSyncronizeTextureMaps")) if (gSavedSettings.getBOOL("SyncMaterialSettings")) - // { alignMaterialsProperties(self); } @@ -2967,11 +2964,7 @@ void LLPanelFace::onCommitFlip(const LLUICtrl* ctrl, const LLSD& user_data) { case MATTYPE_DIFFUSE: self->sendTextureInfo(); -// FIRE-21375 use LL setting name as part of the material sync changes (FIRE-21375) -// if (gSavedSettings.getBOOL("FSSyncronizeTextureMaps")) - if (gSavedSettings.getBOOL("SyncMaterialSettings")) -// { alignMaterialsProperties(self); }