Seems these commits were a victims of late night merging:

Revert "Revert "for making commit 4c4b501dc4573a277850690d5425e215682bff18 functioning in some HG cases we need to ignore attaching the same item again""

This reverts commit 178f78e85b12becf8c5152eef279236bb6cbf34a.
Merge remote-tracking branch 'arribasim-dev/master' into develop

* arribasim-dev/master:
  Seems these commits were a victims of late night merging:

Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs