Merge with SVN trunk

7306690d · Bryan O'Sullivan · 5f4c09fa · 85758bdf · 7306690d · 7306690d
Commit 7306690d authored 15 years ago by Bryan O'Sullivan
--- a/indra/newview/character/skirt_slit_left_alpha.tga
+++ b/indra/newview/character/skirt_slit_left_alpha.tga
--- a/indra/newview/character/skirt_slit_right_alpha.tga
+++ b/indra/newview/character/skirt_slit_right_alpha.tga
--- a/indra/newview/character/underpants_trial_female.tga
+++ b/indra/newview/character/underpants_trial_female.tga
--- a/indra/newview/character/underpants_trial_male.tga
+++ b/indra/newview/character/underpants_trial_male.tga
--- a/indra/newview/character/undershirt_trial_female.tga
+++ b/indra/newview/character/undershirt_trial_female.tga
--- a/indra/newview/character/upperbody_color.tga
+++ b/indra/newview/character/upperbody_color.tga
--- a/indra/newview/character/upperbody_highlights_alpha.tga
+++ b/indra/newview/character/upperbody_highlights_alpha.tga
--- a/indra/newview/character/upperbody_shading_alpha.tga
+++ b/indra/newview/character/upperbody_shading_alpha.tga
--- a/indra/newview/character/upperbodyfreckles_alpha.tga
+++ b/indra/newview/character/upperbodyfreckles_alpha.tga