First re-apply "SH-3941 SH-3954 FIX local appearance does not update properly"
SH-4001 FIX - made local texture loading universal.

Conflicts:

	indra/newview/llvoavatarself.cpp
SUN-57 SH-4039 FIX bake fail on non-ssb regions

We were getting the texture ID from the type,index couple, but were not
passing in index, which defaulted to 0. texture ID is available from the
texture object itself, so using that and removing the index parameter
to prevent future confusion.

Conflicts:

	indra/newview/llvoavatarself.cpp