From 1d8b3d92e24ba01935062e8b6b67b2d65c7173d7 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Tue, 7 Apr 2009 13:44:01 -0700 Subject: Add .hgignore file --- .hgignore | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .hgignore diff --git a/.hgignore b/.hgignore new file mode 100644 index 0000000000..38ff57725e --- /dev/null +++ b/.hgignore @@ -0,0 +1,34 @@ +syntax: glob + +*.pyc +*~ +.*.swp +LICENSES +indra/build-darwin-* +indra/build-vc[0-9]* +indra/lib/mono/1.0/*.dll +indra/lib/mono/indra/*.dll +indra/lib/mono/indra/*.exe +indra/lib/mono/indra/*.pdb +indra/llwindow/glh/glh_linear.h +indra/newview/app_settings/mozilla +indra/newview/app_settings/mozilla-runtime-* +indra/newview/app_settings/mozilla_debug +indra/newview/app_settings/static_*.db2 +indra/newview/character +indra/newview/fmod.dll +indra/newview/mozilla-theme +indra/newview/mozilla-universal-darwin.tgz +indra/newview/res-sdl +indra/newview/skins +indra/newview/vivox-runtime +indra/server-linux-* +indra/test_apps/llmediatest/dependencies/i686-win32 +indra/test_apps/terrain_mule/*.dll +indra/viewer-linux-* +indra/web/doc/asset-upload/plugins/lsl_compiler/lslc +indra/web/doc/asset-upload/plugins/verify-notecard +indra/web/doc/asset-upload/plugins/verify-texture +installed.xml +libraries +tarfile_tmp -- cgit v1.2.3 From 28ed8f954d73d4be28d9fae881682dfa551b0cbb Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Tue, 14 Apr 2009 20:04:08 +0000 Subject: Re-add character data. --- indra/newview/character/attentions.xml | 51 + indra/newview/character/attentionsN.xml | 51 + indra/newview/character/avatar_eye.llm | Bin 0 -> 16011 bytes indra/newview/character/avatar_eye_1.llm | Bin 0 -> 5591 bytes indra/newview/character/avatar_eyelashes.llm | Bin 0 -> 65637 bytes indra/newview/character/avatar_hair.llm | Bin 0 -> 690581 bytes indra/newview/character/avatar_hair_1.llm | Bin 0 -> 5031 bytes indra/newview/character/avatar_hair_2.llm | Bin 0 -> 3261 bytes indra/newview/character/avatar_hair_3.llm | Bin 0 -> 1845 bytes indra/newview/character/avatar_hair_4.llm | Bin 0 -> 927 bytes indra/newview/character/avatar_hair_5.llm | Bin 0 -> 927 bytes indra/newview/character/avatar_head.llm | Bin 0 -> 1665493 bytes indra/newview/character/avatar_head_1.llm | Bin 0 -> 7875 bytes indra/newview/character/avatar_head_2.llm | Bin 0 -> 3675 bytes indra/newview/character/avatar_head_3.llm | Bin 0 -> 1797 bytes indra/newview/character/avatar_head_4.llm | Bin 0 -> 1239 bytes indra/newview/character/avatar_lad.xml | 11264 +++++++++++++++++++ indra/newview/character/avatar_lower_body.llm | Bin 0 -> 337125 bytes indra/newview/character/avatar_lower_body_1.llm | Bin 0 -> 7083 bytes indra/newview/character/avatar_lower_body_2.llm | Bin 0 -> 4107 bytes indra/newview/character/avatar_lower_body_3.llm | Bin 0 -> 2115 bytes indra/newview/character/avatar_lower_body_4.llm | Bin 0 -> 1629 bytes indra/newview/character/avatar_skeleton.xml | 74 + indra/newview/character/avatar_skirt.llm | Bin 0 -> 72497 bytes indra/newview/character/avatar_skirt_1.llm | Bin 0 -> 1899 bytes indra/newview/character/avatar_skirt_2.llm | Bin 0 -> 1551 bytes indra/newview/character/avatar_skirt_3.llm | Bin 0 -> 1191 bytes indra/newview/character/avatar_skirt_4.llm | Bin 0 -> 843 bytes indra/newview/character/avatar_upper_body.llm | Bin 0 -> 929297 bytes indra/newview/character/avatar_upper_body_1.llm | Bin 0 -> 15627 bytes indra/newview/character/avatar_upper_body_2.llm | Bin 0 -> 8991 bytes indra/newview/character/avatar_upper_body_3.llm | Bin 0 -> 4557 bytes indra/newview/character/avatar_upper_body_4.llm | Bin 0 -> 3453 bytes indra/newview/character/blush_alpha.tga | Bin 0 -> 17352 bytes indra/newview/character/body_skingrain.tga | Bin 0 -> 262188 bytes indra/newview/character/bodyfreckles_alpha.tga | Bin 0 -> 257249 bytes indra/newview/character/bump_face_wrinkles.tga | Bin 0 -> 25243 bytes indra/newview/character/bump_head_base.tga | Bin 0 -> 105525 bytes indra/newview/character/bump_lowerbody_base.tga | Bin 0 -> 112782 bytes indra/newview/character/bump_pants_wrinkles.tga | Bin 0 -> 83183 bytes indra/newview/character/bump_shirt_wrinkles.tga | Bin 0 -> 81501 bytes indra/newview/character/bump_upperbody_base.tga | Bin 0 -> 147581 bytes indra/newview/character/eyebrows_alpha.tga | Bin 0 -> 9469 bytes indra/newview/character/eyeliner_alpha.tga | Bin 0 -> 4720 bytes indra/newview/character/eyeshadow_inner_alpha.tga | Bin 0 -> 5466 bytes indra/newview/character/eyeshadow_outer_alpha.tga | Bin 0 -> 7382 bytes indra/newview/character/eyewhite.tga | Bin 0 -> 42353 bytes .../character/facehair_chincurtains_alpha.tga | Bin 0 -> 34610 bytes .../newview/character/facehair_moustache_alpha.tga | Bin 0 -> 14017 bytes .../newview/character/facehair_sideburns_alpha.tga | Bin 0 -> 27328 bytes .../newview/character/facehair_soulpatch_alpha.tga | Bin 0 -> 11277 bytes indra/newview/character/freckles_alpha.tga | Bin 0 -> 140558 bytes indra/newview/character/genepool.xml | 7107 ++++++++++++ indra/newview/character/glove_length_alpha.tga | Bin 0 -> 49745 bytes indra/newview/character/gloves_fingers_alpha.tga | Bin 0 -> 39616 bytes indra/newview/character/head_alpha.tga | Bin 0 -> 6066 bytes indra/newview/character/head_color.tga | Bin 0 -> 70715 bytes indra/newview/character/head_hair.tga | Bin 0 -> 75600 bytes indra/newview/character/head_highlights_alpha.tga | Bin 0 -> 20503 bytes indra/newview/character/head_shading_alpha.tga | Bin 0 -> 35304 bytes indra/newview/character/head_skingrain.tga | Bin 0 -> 262376 bytes .../character/jacket_length_lower_alpha.tga | Bin 0 -> 9768 bytes .../character/jacket_length_upper_alpha.tga | Bin 0 -> 14617 bytes .../newview/character/jacket_open_lower_alpha.tga | Bin 0 -> 19732 bytes .../newview/character/jacket_open_upper_alpha.tga | Bin 0 -> 41606 bytes indra/newview/character/lipgloss_alpha.tga | Bin 0 -> 4738 bytes indra/newview/character/lips_mask.tga | Bin 0 -> 6110 bytes indra/newview/character/lipstick_alpha.tga | Bin 0 -> 7966 bytes indra/newview/character/lowerbody_color.tga | Bin 0 -> 135395 bytes .../character/lowerbody_highlights_alpha.tga | Bin 0 -> 8695 bytes .../newview/character/lowerbody_shading_alpha.tga | Bin 0 -> 41766 bytes indra/newview/character/nailpolish_alpha.tga | Bin 0 -> 4656 bytes indra/newview/character/pants_length_alpha.tga | Bin 0 -> 26843 bytes indra/newview/character/pants_waist_alpha.tga | Bin 0 -> 10487 bytes indra/newview/character/rosyface_alpha.tga | Bin 0 -> 44382 bytes indra/newview/character/rouge_alpha.tga | Bin 0 -> 44382 bytes indra/newview/character/shirt_bottom_alpha.tga | Bin 0 -> 32242 bytes indra/newview/character/shirt_collar_alpha.tga | Bin 0 -> 14417 bytes .../newview/character/shirt_collar_back_alpha.tga | Bin 0 -> 12789 bytes indra/newview/character/shirt_sleeve_alpha.tga | Bin 0 -> 72196 bytes indra/newview/character/shoe_height_alpha.tga | Bin 0 -> 24461 bytes indra/newview/character/skirt_length_alpha.tga | Bin 0 -> 4114 bytes indra/newview/character/skirt_slit_back_alpha.tga | Bin 0 -> 90350 bytes indra/newview/character/skirt_slit_front_alpha.tga | Bin 0 -> 90350 bytes indra/newview/character/skirt_slit_left_alpha.tga | Bin 0 -> 82006 bytes indra/newview/character/skirt_slit_right_alpha.tga | Bin 0 -> 91410 bytes .../newview/character/underpants_trial_female.tga | Bin 0 -> 48063 bytes indra/newview/character/underpants_trial_male.tga | Bin 0 -> 144983 bytes .../newview/character/undershirt_trial_female.tga | Bin 0 -> 81390 bytes indra/newview/character/upperbody_color.tga | Bin 0 -> 23348 bytes .../character/upperbody_highlights_alpha.tga | Bin 0 -> 6509 bytes .../newview/character/upperbody_shading_alpha.tga | Bin 0 -> 25297 bytes .../newview/character/upperbodyfreckles_alpha.tga | Bin 0 -> 180104 bytes install.xml | 63 - 94 files changed, 18547 insertions(+), 63 deletions(-) create mode 100644 indra/newview/character/attentions.xml create mode 100644 indra/newview/character/attentionsN.xml create mode 100644 indra/newview/character/avatar_eye.llm create mode 100644 indra/newview/character/avatar_eye_1.llm create mode 100644 indra/newview/character/avatar_eyelashes.llm create mode 100644 indra/newview/character/avatar_hair.llm create mode 100644 indra/newview/character/avatar_hair_1.llm create mode 100644 indra/newview/character/avatar_hair_2.llm create mode 100644 indra/newview/character/avatar_hair_3.llm create mode 100644 indra/newview/character/avatar_hair_4.llm create mode 100644 indra/newview/character/avatar_hair_5.llm create mode 100644 indra/newview/character/avatar_head.llm create mode 100644 indra/newview/character/avatar_head_1.llm create mode 100644 indra/newview/character/avatar_head_2.llm create mode 100644 indra/newview/character/avatar_head_3.llm create mode 100644 indra/newview/character/avatar_head_4.llm create mode 100644 indra/newview/character/avatar_lad.xml create mode 100644 indra/newview/character/avatar_lower_body.llm create mode 100644 indra/newview/character/avatar_lower_body_1.llm create mode 100644 indra/newview/character/avatar_lower_body_2.llm create mode 100644 indra/newview/character/avatar_lower_body_3.llm create mode 100644 indra/newview/character/avatar_lower_body_4.llm create mode 100644 indra/newview/character/avatar_skeleton.xml create mode 100644 indra/newview/character/avatar_skirt.llm create mode 100644 indra/newview/character/avatar_skirt_1.llm create mode 100644 indra/newview/character/avatar_skirt_2.llm create mode 100644 indra/newview/character/avatar_skirt_3.llm create mode 100644 indra/newview/character/avatar_skirt_4.llm create mode 100644 indra/newview/character/avatar_upper_body.llm create mode 100644 indra/newview/character/avatar_upper_body_1.llm create mode 100644 indra/newview/character/avatar_upper_body_2.llm create mode 100644 indra/newview/character/avatar_upper_body_3.llm create mode 100644 indra/newview/character/avatar_upper_body_4.llm create mode 100644 indra/newview/character/blush_alpha.tga create mode 100644 indra/newview/character/body_skingrain.tga create mode 100644 indra/newview/character/bodyfreckles_alpha.tga create mode 100644 indra/newview/character/bump_face_wrinkles.tga create mode 100644 indra/newview/character/bump_head_base.tga create mode 100644 indra/newview/character/bump_lowerbody_base.tga create mode 100644 indra/newview/character/bump_pants_wrinkles.tga create mode 100644 indra/newview/character/bump_shirt_wrinkles.tga create mode 100644 indra/newview/character/bump_upperbody_base.tga create mode 100644 indra/newview/character/eyebrows_alpha.tga create mode 100644 indra/newview/character/eyeliner_alpha.tga create mode 100644 indra/newview/character/eyeshadow_inner_alpha.tga create mode 100644 indra/newview/character/eyeshadow_outer_alpha.tga create mode 100644 indra/newview/character/eyewhite.tga create mode 100644 indra/newview/character/facehair_chincurtains_alpha.tga create mode 100644 indra/newview/character/facehair_moustache_alpha.tga create mode 100644 indra/newview/character/facehair_sideburns_alpha.tga create mode 100644 indra/newview/character/facehair_soulpatch_alpha.tga create mode 100644 indra/newview/character/freckles_alpha.tga create mode 100644 indra/newview/character/genepool.xml create mode 100644 indra/newview/character/glove_length_alpha.tga create mode 100644 indra/newview/character/gloves_fingers_alpha.tga create mode 100644 indra/newview/character/head_alpha.tga create mode 100644 indra/newview/character/head_color.tga create mode 100644 indra/newview/character/head_hair.tga create mode 100644 indra/newview/character/head_highlights_alpha.tga create mode 100644 indra/newview/character/head_shading_alpha.tga create mode 100644 indra/newview/character/head_skingrain.tga create mode 100644 indra/newview/character/jacket_length_lower_alpha.tga create mode 100644 indra/newview/character/jacket_length_upper_alpha.tga create mode 100644 indra/newview/character/jacket_open_lower_alpha.tga create mode 100644 indra/newview/character/jacket_open_upper_alpha.tga create mode 100644 indra/newview/character/lipgloss_alpha.tga create mode 100644 indra/newview/character/lips_mask.tga create mode 100644 indra/newview/character/lipstick_alpha.tga create mode 100644 indra/newview/character/lowerbody_color.tga create mode 100644 indra/newview/character/lowerbody_highlights_alpha.tga create mode 100644 indra/newview/character/lowerbody_shading_alpha.tga create mode 100644 indra/newview/character/nailpolish_alpha.tga create mode 100644 indra/newview/character/pants_length_alpha.tga create mode 100644 indra/newview/character/pants_waist_alpha.tga create mode 100644 indra/newview/character/rosyface_alpha.tga create mode 100644 indra/newview/character/rouge_alpha.tga create mode 100644 indra/newview/character/shirt_bottom_alpha.tga create mode 100644 indra/newview/character/shirt_collar_alpha.tga create mode 100644 indra/newview/character/shirt_collar_back_alpha.tga create mode 100644 indra/newview/character/shirt_sleeve_alpha.tga create mode 100644 indra/newview/character/shoe_height_alpha.tga create mode 100644 indra/newview/character/skirt_length_alpha.tga create mode 100644 indra/newview/character/skirt_slit_back_alpha.tga create mode 100644 indra/newview/character/skirt_slit_front_alpha.tga create mode 100644 indra/newview/character/skirt_slit_left_alpha.tga create mode 100644 indra/newview/character/skirt_slit_right_alpha.tga create mode 100644 indra/newview/character/underpants_trial_female.tga create mode 100644 indra/newview/character/underpants_trial_male.tga create mode 100644 indra/newview/character/undershirt_trial_female.tga create mode 100644 indra/newview/character/upperbody_color.tga create mode 100644 indra/newview/character/upperbody_highlights_alpha.tga create mode 100644 indra/newview/character/upperbody_shading_alpha.tga create mode 100644 indra/newview/character/upperbodyfreckles_alpha.tga diff --git a/indra/newview/character/attentions.xml b/indra/newview/character/attentions.xml new file mode 100644 index 0000000000..be9a2b28fc --- /dev/null +++ b/indra/newview/character/attentions.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/character/attentionsN.xml b/indra/newview/character/attentionsN.xml new file mode 100644 index 0000000000..e7d9bb6a16 --- /dev/null +++ b/indra/newview/character/attentionsN.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/character/avatar_eye.llm b/indra/newview/character/avatar_eye.llm new file mode 100644 index 0000000000..8c6e74e1de Binary files /dev/null and b/indra/newview/character/avatar_eye.llm differ diff --git a/indra/newview/character/avatar_eye_1.llm b/indra/newview/character/avatar_eye_1.llm new file mode 100644 index 0000000000..7a3b0d6f28 Binary files /dev/null and b/indra/newview/character/avatar_eye_1.llm differ diff --git a/indra/newview/character/avatar_eyelashes.llm b/indra/newview/character/avatar_eyelashes.llm new file mode 100644 index 0000000000..99995b5758 Binary files /dev/null and b/indra/newview/character/avatar_eyelashes.llm differ diff --git a/indra/newview/character/avatar_hair.llm b/indra/newview/character/avatar_hair.llm new file mode 100644 index 0000000000..df99de8db7 Binary files /dev/null and b/indra/newview/character/avatar_hair.llm differ diff --git a/indra/newview/character/avatar_hair_1.llm b/indra/newview/character/avatar_hair_1.llm new file mode 100644 index 0000000000..6de31fdc23 Binary files /dev/null and b/indra/newview/character/avatar_hair_1.llm differ diff --git a/indra/newview/character/avatar_hair_2.llm b/indra/newview/character/avatar_hair_2.llm new file mode 100644 index 0000000000..47d02ba9ce Binary files /dev/null and b/indra/newview/character/avatar_hair_2.llm differ diff --git a/indra/newview/character/avatar_hair_3.llm b/indra/newview/character/avatar_hair_3.llm new file mode 100644 index 0000000000..107f9e2a53 Binary files /dev/null and b/indra/newview/character/avatar_hair_3.llm differ diff --git a/indra/newview/character/avatar_hair_4.llm b/indra/newview/character/avatar_hair_4.llm new file mode 100644 index 0000000000..1b9a12a0ca Binary files /dev/null and b/indra/newview/character/avatar_hair_4.llm differ diff --git a/indra/newview/character/avatar_hair_5.llm b/indra/newview/character/avatar_hair_5.llm new file mode 100644 index 0000000000..1b9a12a0ca Binary files /dev/null and b/indra/newview/character/avatar_hair_5.llm differ diff --git a/indra/newview/character/avatar_head.llm b/indra/newview/character/avatar_head.llm new file mode 100644 index 0000000000..8d8b5e0442 Binary files /dev/null and b/indra/newview/character/avatar_head.llm differ diff --git a/indra/newview/character/avatar_head_1.llm b/indra/newview/character/avatar_head_1.llm new file mode 100644 index 0000000000..26291e6584 Binary files /dev/null and b/indra/newview/character/avatar_head_1.llm differ diff --git a/indra/newview/character/avatar_head_2.llm b/indra/newview/character/avatar_head_2.llm new file mode 100644 index 0000000000..c2b808b1a6 Binary files /dev/null and b/indra/newview/character/avatar_head_2.llm differ diff --git a/indra/newview/character/avatar_head_3.llm b/indra/newview/character/avatar_head_3.llm new file mode 100644 index 0000000000..a0676b1f1c Binary files /dev/null and b/indra/newview/character/avatar_head_3.llm differ diff --git a/indra/newview/character/avatar_head_4.llm b/indra/newview/character/avatar_head_4.llm new file mode 100644 index 0000000000..5035585770 Binary files /dev/null and b/indra/newview/character/avatar_head_4.llm differ diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml new file mode 100644 index 0000000000..f484167cab --- /dev/null +++ b/indra/newview/character/avatar_lad.xml @@ -0,0 +1,11264 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/character/avatar_lower_body.llm b/indra/newview/character/avatar_lower_body.llm new file mode 100644 index 0000000000..0420899739 Binary files /dev/null and b/indra/newview/character/avatar_lower_body.llm differ diff --git a/indra/newview/character/avatar_lower_body_1.llm b/indra/newview/character/avatar_lower_body_1.llm new file mode 100644 index 0000000000..1394eb848b Binary files /dev/null and b/indra/newview/character/avatar_lower_body_1.llm differ diff --git a/indra/newview/character/avatar_lower_body_2.llm b/indra/newview/character/avatar_lower_body_2.llm new file mode 100644 index 0000000000..0da9c1249e Binary files /dev/null and b/indra/newview/character/avatar_lower_body_2.llm differ diff --git a/indra/newview/character/avatar_lower_body_3.llm b/indra/newview/character/avatar_lower_body_3.llm new file mode 100644 index 0000000000..f3c49a1568 Binary files /dev/null and b/indra/newview/character/avatar_lower_body_3.llm differ diff --git a/indra/newview/character/avatar_lower_body_4.llm b/indra/newview/character/avatar_lower_body_4.llm new file mode 100644 index 0000000000..e71721063e Binary files /dev/null and b/indra/newview/character/avatar_lower_body_4.llm differ diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml new file mode 100644 index 0000000000..5e73804f2d --- /dev/null +++ b/indra/newview/character/avatar_skeleton.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/indra/newview/character/avatar_skirt.llm b/indra/newview/character/avatar_skirt.llm new file mode 100644 index 0000000000..08ce3d1700 Binary files /dev/null and b/indra/newview/character/avatar_skirt.llm differ diff --git a/indra/newview/character/avatar_skirt_1.llm b/indra/newview/character/avatar_skirt_1.llm new file mode 100644 index 0000000000..88076c321f Binary files /dev/null and b/indra/newview/character/avatar_skirt_1.llm differ diff --git a/indra/newview/character/avatar_skirt_2.llm b/indra/newview/character/avatar_skirt_2.llm new file mode 100644 index 0000000000..73b3effbc6 Binary files /dev/null and b/indra/newview/character/avatar_skirt_2.llm differ diff --git a/indra/newview/character/avatar_skirt_3.llm b/indra/newview/character/avatar_skirt_3.llm new file mode 100644 index 0000000000..ded546fdea Binary files /dev/null and b/indra/newview/character/avatar_skirt_3.llm differ diff --git a/indra/newview/character/avatar_skirt_4.llm b/indra/newview/character/avatar_skirt_4.llm new file mode 100644 index 0000000000..b9d5cb945e Binary files /dev/null and b/indra/newview/character/avatar_skirt_4.llm differ diff --git a/indra/newview/character/avatar_upper_body.llm b/indra/newview/character/avatar_upper_body.llm new file mode 100644 index 0000000000..da7d990540 Binary files /dev/null and b/indra/newview/character/avatar_upper_body.llm differ diff --git a/indra/newview/character/avatar_upper_body_1.llm b/indra/newview/character/avatar_upper_body_1.llm new file mode 100644 index 0000000000..31e104cc20 Binary files /dev/null and b/indra/newview/character/avatar_upper_body_1.llm differ diff --git a/indra/newview/character/avatar_upper_body_2.llm b/indra/newview/character/avatar_upper_body_2.llm new file mode 100644 index 0000000000..c1f4199b9c Binary files /dev/null and b/indra/newview/character/avatar_upper_body_2.llm differ diff --git a/indra/newview/character/avatar_upper_body_3.llm b/indra/newview/character/avatar_upper_body_3.llm new file mode 100644 index 0000000000..9e89ed8b3e Binary files /dev/null and b/indra/newview/character/avatar_upper_body_3.llm differ diff --git a/indra/newview/character/avatar_upper_body_4.llm b/indra/newview/character/avatar_upper_body_4.llm new file mode 100644 index 0000000000..ec836d1dc3 Binary files /dev/null and b/indra/newview/character/avatar_upper_body_4.llm differ diff --git a/indra/newview/character/blush_alpha.tga b/indra/newview/character/blush_alpha.tga new file mode 100644 index 0000000000..05be7e7e3d Binary files /dev/null and b/indra/newview/character/blush_alpha.tga differ diff --git a/indra/newview/character/body_skingrain.tga b/indra/newview/character/body_skingrain.tga new file mode 100644 index 0000000000..7264baac14 Binary files /dev/null and b/indra/newview/character/body_skingrain.tga differ diff --git a/indra/newview/character/bodyfreckles_alpha.tga b/indra/newview/character/bodyfreckles_alpha.tga new file mode 100644 index 0000000000..d30ab3d122 Binary files /dev/null and b/indra/newview/character/bodyfreckles_alpha.tga differ diff --git a/indra/newview/character/bump_face_wrinkles.tga b/indra/newview/character/bump_face_wrinkles.tga new file mode 100644 index 0000000000..54bf7a55be Binary files /dev/null and b/indra/newview/character/bump_face_wrinkles.tga differ diff --git a/indra/newview/character/bump_head_base.tga b/indra/newview/character/bump_head_base.tga new file mode 100644 index 0000000000..fa3568573a Binary files /dev/null and b/indra/newview/character/bump_head_base.tga differ diff --git a/indra/newview/character/bump_lowerbody_base.tga b/indra/newview/character/bump_lowerbody_base.tga new file mode 100644 index 0000000000..498ea3c721 Binary files /dev/null and b/indra/newview/character/bump_lowerbody_base.tga differ diff --git a/indra/newview/character/bump_pants_wrinkles.tga b/indra/newview/character/bump_pants_wrinkles.tga new file mode 100644 index 0000000000..cca72415e8 Binary files /dev/null and b/indra/newview/character/bump_pants_wrinkles.tga differ diff --git a/indra/newview/character/bump_shirt_wrinkles.tga b/indra/newview/character/bump_shirt_wrinkles.tga new file mode 100644 index 0000000000..9e0d757a48 Binary files /dev/null and b/indra/newview/character/bump_shirt_wrinkles.tga differ diff --git a/indra/newview/character/bump_upperbody_base.tga b/indra/newview/character/bump_upperbody_base.tga new file mode 100644 index 0000000000..e57d6352e6 Binary files /dev/null and b/indra/newview/character/bump_upperbody_base.tga differ diff --git a/indra/newview/character/eyebrows_alpha.tga b/indra/newview/character/eyebrows_alpha.tga new file mode 100644 index 0000000000..c363e482e1 Binary files /dev/null and b/indra/newview/character/eyebrows_alpha.tga differ diff --git a/indra/newview/character/eyeliner_alpha.tga b/indra/newview/character/eyeliner_alpha.tga new file mode 100644 index 0000000000..1611eb3355 Binary files /dev/null and b/indra/newview/character/eyeliner_alpha.tga differ diff --git a/indra/newview/character/eyeshadow_inner_alpha.tga b/indra/newview/character/eyeshadow_inner_alpha.tga new file mode 100644 index 0000000000..37d7919395 Binary files /dev/null and b/indra/newview/character/eyeshadow_inner_alpha.tga differ diff --git a/indra/newview/character/eyeshadow_outer_alpha.tga b/indra/newview/character/eyeshadow_outer_alpha.tga new file mode 100644 index 0000000000..00eef9d9f7 Binary files /dev/null and b/indra/newview/character/eyeshadow_outer_alpha.tga differ diff --git a/indra/newview/character/eyewhite.tga b/indra/newview/character/eyewhite.tga new file mode 100644 index 0000000000..a720496988 Binary files /dev/null and b/indra/newview/character/eyewhite.tga differ diff --git a/indra/newview/character/facehair_chincurtains_alpha.tga b/indra/newview/character/facehair_chincurtains_alpha.tga new file mode 100644 index 0000000000..b10397063c Binary files /dev/null and b/indra/newview/character/facehair_chincurtains_alpha.tga differ diff --git a/indra/newview/character/facehair_moustache_alpha.tga b/indra/newview/character/facehair_moustache_alpha.tga new file mode 100644 index 0000000000..4068c4f2b1 Binary files /dev/null and b/indra/newview/character/facehair_moustache_alpha.tga differ diff --git a/indra/newview/character/facehair_sideburns_alpha.tga b/indra/newview/character/facehair_sideburns_alpha.tga new file mode 100644 index 0000000000..acddc2d9bd Binary files /dev/null and b/indra/newview/character/facehair_sideburns_alpha.tga differ diff --git a/indra/newview/character/facehair_soulpatch_alpha.tga b/indra/newview/character/facehair_soulpatch_alpha.tga new file mode 100644 index 0000000000..687091a29f Binary files /dev/null and b/indra/newview/character/facehair_soulpatch_alpha.tga differ diff --git a/indra/newview/character/freckles_alpha.tga b/indra/newview/character/freckles_alpha.tga new file mode 100644 index 0000000000..a9a4ec0735 Binary files /dev/null and b/indra/newview/character/freckles_alpha.tga differ diff --git a/indra/newview/character/genepool.xml b/indra/newview/character/genepool.xml new file mode 100644 index 0000000000..52300c2bab --- /dev/null +++ b/indra/newview/character/genepool.xml @@ -0,0 +1,7107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/character/glove_length_alpha.tga b/indra/newview/character/glove_length_alpha.tga new file mode 100644 index 0000000000..db89ad57e7 Binary files /dev/null and b/indra/newview/character/glove_length_alpha.tga differ diff --git a/indra/newview/character/gloves_fingers_alpha.tga b/indra/newview/character/gloves_fingers_alpha.tga new file mode 100644 index 0000000000..dba2eec277 Binary files /dev/null and b/indra/newview/character/gloves_fingers_alpha.tga differ diff --git a/indra/newview/character/head_alpha.tga b/indra/newview/character/head_alpha.tga new file mode 100644 index 0000000000..8164525353 Binary files /dev/null and b/indra/newview/character/head_alpha.tga differ diff --git a/indra/newview/character/head_color.tga b/indra/newview/character/head_color.tga new file mode 100644 index 0000000000..74b1b3078b Binary files /dev/null and b/indra/newview/character/head_color.tga differ diff --git a/indra/newview/character/head_hair.tga b/indra/newview/character/head_hair.tga new file mode 100644 index 0000000000..5321f35204 Binary files /dev/null and b/indra/newview/character/head_hair.tga differ diff --git a/indra/newview/character/head_highlights_alpha.tga b/indra/newview/character/head_highlights_alpha.tga new file mode 100644 index 0000000000..8dc5239f97 Binary files /dev/null and b/indra/newview/character/head_highlights_alpha.tga differ diff --git a/indra/newview/character/head_shading_alpha.tga b/indra/newview/character/head_shading_alpha.tga new file mode 100644 index 0000000000..e8ea490109 Binary files /dev/null and b/indra/newview/character/head_shading_alpha.tga differ diff --git a/indra/newview/character/head_skingrain.tga b/indra/newview/character/head_skingrain.tga new file mode 100644 index 0000000000..b42dee0809 Binary files /dev/null and b/indra/newview/character/head_skingrain.tga differ diff --git a/indra/newview/character/jacket_length_lower_alpha.tga b/indra/newview/character/jacket_length_lower_alpha.tga new file mode 100644 index 0000000000..722bc192a8 Binary files /dev/null and b/indra/newview/character/jacket_length_lower_alpha.tga differ diff --git a/indra/newview/character/jacket_length_upper_alpha.tga b/indra/newview/character/jacket_length_upper_alpha.tga new file mode 100644 index 0000000000..e9db7e7b1f Binary files /dev/null and b/indra/newview/character/jacket_length_upper_alpha.tga differ diff --git a/indra/newview/character/jacket_open_lower_alpha.tga b/indra/newview/character/jacket_open_lower_alpha.tga new file mode 100644 index 0000000000..db0c2fb0e3 Binary files /dev/null and b/indra/newview/character/jacket_open_lower_alpha.tga differ diff --git a/indra/newview/character/jacket_open_upper_alpha.tga b/indra/newview/character/jacket_open_upper_alpha.tga new file mode 100644 index 0000000000..71b8a0b805 Binary files /dev/null and b/indra/newview/character/jacket_open_upper_alpha.tga differ diff --git a/indra/newview/character/lipgloss_alpha.tga b/indra/newview/character/lipgloss_alpha.tga new file mode 100644 index 0000000000..78ceecaf85 Binary files /dev/null and b/indra/newview/character/lipgloss_alpha.tga differ diff --git a/indra/newview/character/lips_mask.tga b/indra/newview/character/lips_mask.tga new file mode 100644 index 0000000000..ae1401c006 Binary files /dev/null and b/indra/newview/character/lips_mask.tga differ diff --git a/indra/newview/character/lipstick_alpha.tga b/indra/newview/character/lipstick_alpha.tga new file mode 100644 index 0000000000..2795f1bd40 Binary files /dev/null and b/indra/newview/character/lipstick_alpha.tga differ diff --git a/indra/newview/character/lowerbody_color.tga b/indra/newview/character/lowerbody_color.tga new file mode 100644 index 0000000000..a63aa12fca Binary files /dev/null and b/indra/newview/character/lowerbody_color.tga differ diff --git a/indra/newview/character/lowerbody_highlights_alpha.tga b/indra/newview/character/lowerbody_highlights_alpha.tga new file mode 100644 index 0000000000..ae3413ac8b Binary files /dev/null and b/indra/newview/character/lowerbody_highlights_alpha.tga differ diff --git a/indra/newview/character/lowerbody_shading_alpha.tga b/indra/newview/character/lowerbody_shading_alpha.tga new file mode 100644 index 0000000000..0242663a7d Binary files /dev/null and b/indra/newview/character/lowerbody_shading_alpha.tga differ diff --git a/indra/newview/character/nailpolish_alpha.tga b/indra/newview/character/nailpolish_alpha.tga new file mode 100644 index 0000000000..91af762902 Binary files /dev/null and b/indra/newview/character/nailpolish_alpha.tga differ diff --git a/indra/newview/character/pants_length_alpha.tga b/indra/newview/character/pants_length_alpha.tga new file mode 100644 index 0000000000..3c4f21c0f2 Binary files /dev/null and b/indra/newview/character/pants_length_alpha.tga differ diff --git a/indra/newview/character/pants_waist_alpha.tga b/indra/newview/character/pants_waist_alpha.tga new file mode 100644 index 0000000000..35658c0896 Binary files /dev/null and b/indra/newview/character/pants_waist_alpha.tga differ diff --git a/indra/newview/character/rosyface_alpha.tga b/indra/newview/character/rosyface_alpha.tga new file mode 100644 index 0000000000..a0c8513da2 Binary files /dev/null and b/indra/newview/character/rosyface_alpha.tga differ diff --git a/indra/newview/character/rouge_alpha.tga b/indra/newview/character/rouge_alpha.tga new file mode 100644 index 0000000000..a0c8513da2 Binary files /dev/null and b/indra/newview/character/rouge_alpha.tga differ diff --git a/indra/newview/character/shirt_bottom_alpha.tga b/indra/newview/character/shirt_bottom_alpha.tga new file mode 100644 index 0000000000..7cce03dbe0 Binary files /dev/null and b/indra/newview/character/shirt_bottom_alpha.tga differ diff --git a/indra/newview/character/shirt_collar_alpha.tga b/indra/newview/character/shirt_collar_alpha.tga new file mode 100644 index 0000000000..f55f635473 Binary files /dev/null and b/indra/newview/character/shirt_collar_alpha.tga differ diff --git a/indra/newview/character/shirt_collar_back_alpha.tga b/indra/newview/character/shirt_collar_back_alpha.tga new file mode 100644 index 0000000000..43a6453107 Binary files /dev/null and b/indra/newview/character/shirt_collar_back_alpha.tga differ diff --git a/indra/newview/character/shirt_sleeve_alpha.tga b/indra/newview/character/shirt_sleeve_alpha.tga new file mode 100644 index 0000000000..e3b18f4fc6 Binary files /dev/null and b/indra/newview/character/shirt_sleeve_alpha.tga differ diff --git a/indra/newview/character/shoe_height_alpha.tga b/indra/newview/character/shoe_height_alpha.tga new file mode 100644 index 0000000000..d08dd750f3 Binary files /dev/null and b/indra/newview/character/shoe_height_alpha.tga differ diff --git a/indra/newview/character/skirt_length_alpha.tga b/indra/newview/character/skirt_length_alpha.tga new file mode 100644 index 0000000000..c86799469d Binary files /dev/null and b/indra/newview/character/skirt_length_alpha.tga differ diff --git a/indra/newview/character/skirt_slit_back_alpha.tga b/indra/newview/character/skirt_slit_back_alpha.tga new file mode 100644 index 0000000000..0e49688b14 Binary files /dev/null and b/indra/newview/character/skirt_slit_back_alpha.tga differ diff --git a/indra/newview/character/skirt_slit_front_alpha.tga b/indra/newview/character/skirt_slit_front_alpha.tga new file mode 100644 index 0000000000..888bbf71a1 Binary files /dev/null and b/indra/newview/character/skirt_slit_front_alpha.tga differ diff --git a/indra/newview/character/skirt_slit_left_alpha.tga b/indra/newview/character/skirt_slit_left_alpha.tga new file mode 100644 index 0000000000..210feac1ea Binary files /dev/null and b/indra/newview/character/skirt_slit_left_alpha.tga differ diff --git a/indra/newview/character/skirt_slit_right_alpha.tga b/indra/newview/character/skirt_slit_right_alpha.tga new file mode 100644 index 0000000000..ce11c64bf6 Binary files /dev/null and b/indra/newview/character/skirt_slit_right_alpha.tga differ diff --git a/indra/newview/character/underpants_trial_female.tga b/indra/newview/character/underpants_trial_female.tga new file mode 100644 index 0000000000..96bf732351 Binary files /dev/null and b/indra/newview/character/underpants_trial_female.tga differ diff --git a/indra/newview/character/underpants_trial_male.tga b/indra/newview/character/underpants_trial_male.tga new file mode 100644 index 0000000000..095695ca1c Binary files /dev/null and b/indra/newview/character/underpants_trial_male.tga differ diff --git a/indra/newview/character/undershirt_trial_female.tga b/indra/newview/character/undershirt_trial_female.tga new file mode 100644 index 0000000000..e17a309531 Binary files /dev/null and b/indra/newview/character/undershirt_trial_female.tga differ diff --git a/indra/newview/character/upperbody_color.tga b/indra/newview/character/upperbody_color.tga new file mode 100644 index 0000000000..85fcc41142 Binary files /dev/null and b/indra/newview/character/upperbody_color.tga differ diff --git a/indra/newview/character/upperbody_highlights_alpha.tga b/indra/newview/character/upperbody_highlights_alpha.tga new file mode 100644 index 0000000000..2d8102b583 Binary files /dev/null and b/indra/newview/character/upperbody_highlights_alpha.tga differ diff --git a/indra/newview/character/upperbody_shading_alpha.tga b/indra/newview/character/upperbody_shading_alpha.tga new file mode 100644 index 0000000000..b420506b3e Binary files /dev/null and b/indra/newview/character/upperbody_shading_alpha.tga differ diff --git a/indra/newview/character/upperbodyfreckles_alpha.tga b/indra/newview/character/upperbodyfreckles_alpha.tga new file mode 100644 index 0000000000..76c7ce8849 Binary files /dev/null and b/indra/newview/character/upperbodyfreckles_alpha.tga differ diff --git a/install.xml b/install.xml index 54d0600eb7..b4941bd3e2 100644 --- a/install.xml +++ b/install.xml @@ -152,39 +152,6 @@ - artwork-common - - copyright - (C) 2008 Linden Research, Inc. - description - Second Life(TM) Viewer Artwork - license - artwork - packages - - darwin - - md5sum - affe242f304f2c62b4dc7fa2db068a34 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090331.tar.bz2 - - linux - - md5sum - affe242f304f2c62b4dc7fa2db068a34 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090331.tar.bz2 - - windows - - md5sum - affe242f304f2c62b4dc7fa2db068a34 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090331.tar.bz2 - - - berkeley copyright @@ -1344,36 +1311,6 @@ anguage Infrstructure (CLI) international standard url http://www.apache.org/licenses/LICENSE-2.0 - artwork - - text - COPYRIGHT AND PERMISSION NOTICE - -Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. - -Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer -artwork and other works in the files distributed with this Notice under -the Creative Commons Attribution-Share Alike 3.0 License, available at -http://creativecommons.org/licenses/by-sa/3.0/legalcode. For the license -summary, see http://creativecommons.org/licenses/by-sa/3.0/. - -Notwithstanding the foregoing, all of Linden Lab's trademarks, including -but not limited to the Second Life brand name and Second Life Eye-in-Hand -logo, are subject to our trademark policy at -http://secondlife.com/corporate/trademark/. - -If you distribute any copies or adaptations of the Second Life viewer -artwork or any other works in these files, you must include this Notice -and clearly identify any changes made to the original works. Include -this Notice and information where copyright notices are usually included, -for example, after your own copyright notice acknowledging your use of -the Second Life viewer artwork, in a text file distributed with your -program, in your application's About window, or on a credits page for -your work. - - url - http://svn.secondlife.com/svn/linden/trunk/doc/LICENSE-logos.txt - boost url -- cgit v1.2.3 From 87524528a1fea00139ed42151a920596a880ae82 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Tue, 14 Apr 2009 20:10:56 +0000 Subject: Missed a file. --- indra/newview/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 0f796bbdff..f570866489 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1081,8 +1081,6 @@ set_source_files_properties(${viewer_APPSETTINGS_FILES} list(APPEND viewer_SOURCE_FILES ${viewer_APPSETTINGS_FILES}) -use_prebuilt_binary(artwork-common) - set(viewer_CHARACTER_FILES character/attentions.xml character/attentionsN.xml -- cgit v1.2.3 From 5748a14f5d7e85230e74c330a7c2b058856be9cd Mon Sep 17 00:00:00 2001 From: David Kaprielian Date: Thu, 21 May 2009 13:54:35 -0700 Subject: os.putenv doesn't do what we want, replaced with os.environ instead. --- indra/develop.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/develop.py b/indra/develop.py index f670c66639..1398bca935 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -385,7 +385,7 @@ class LinuxSetup(UnixSetup): distcc_dir = os.path.join(getcwd(), '.distcc') if not os.path.exists(distcc_dir): os.mkdir(distcc_dir) - os.putenv('DISTCC_DIR', distcc_dir) + os.environ['DISTCC_DIR'] = distcc_dir if job_count is None: hosts, job_count = count_distcc_hosts() @@ -393,10 +393,10 @@ class LinuxSetup(UnixSetup): hostname = socket.gethostname() if hostname.startswith('station'): hosts, job_count = mk_distcc_hosts('station', 36, 2) - os.putenv('DISTCC_HOSTS', hosts) + os.environ['DISTCC_HOSTS'] = hosts if hostname.startswith('eniac'): hosts, job_count = mk_distcc_hosts('eniac', 71, 2) - os.putenv('DISTCC_HOSTS', hosts) + os.environ['DISTCC_HOSTS'] = hosts if job_count > 12: job_count = 12; opts.extend(['-j', str(job_count)]) -- cgit v1.2.3 From 9c394b3aaecacc9a70354c544bd728a4f4f966d2 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Thu, 25 Jun 2009 11:19:00 -0700 Subject: Ignore distcc state directory --- .hgignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgignore b/.hgignore index 38ff57725e..61c38705f4 100644 --- a/.hgignore +++ b/.hgignore @@ -4,6 +4,7 @@ syntax: glob *~ .*.swp LICENSES +indra/.distcc indra/build-darwin-* indra/build-vc[0-9]* indra/lib/mono/1.0/*.dll -- cgit v1.2.3