Merge with SVN trunk

7306690d · Bryan O'Sullivan · 5f4c09fa · 85758bdf · 7306690d · 7306690d
Commit 7306690d authored 15 years ago by Bryan O'Sullivan
--- a/.hgignore
+++ b/.hgignore
+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
--- a/indra/newview/character/avatar_eye.llm
+++ b/indra/newview/character/avatar_eye.llm
--- a/indra/newview/character/avatar_eye_1.llm
+++ b/indra/newview/character/avatar_eye_1.llm
--- a/indra/newview/character/avatar_eyelashes.llm
+++ b/indra/newview/character/avatar_eyelashes.llm
--- a/indra/newview/character/avatar_hair.llm
+++ b/indra/newview/character/avatar_hair.llm
--- a/indra/newview/character/avatar_hair_1.llm
+++ b/indra/newview/character/avatar_hair_1.llm
--- a/indra/newview/character/avatar_hair_2.llm
+++ b/indra/newview/character/avatar_hair_2.llm
--- a/indra/newview/character/avatar_hair_3.llm
+++ b/indra/newview/character/avatar_hair_3.llm
--- a/indra/newview/character/avatar_hair_4.llm
+++ b/indra/newview/character/avatar_hair_4.llm
--- a/indra/newview/character/avatar_hair_5.llm
+++ b/indra/newview/character/avatar_hair_5.llm
--- a/indra/newview/character/avatar_head.llm
+++ b/indra/newview/character/avatar_head.llm
--- a/indra/newview/character/avatar_head_1.llm
+++ b/indra/newview/character/avatar_head_1.llm
--- a/indra/newview/character/avatar_head_2.llm
+++ b/indra/newview/character/avatar_head_2.llm
--- a/indra/newview/character/avatar_head_3.llm
+++ b/indra/newview/character/avatar_head_3.llm
--- a/indra/newview/character/avatar_head_4.llm
+++ b/indra/newview/character/avatar_head_4.llm
--- a/indra/newview/character/avatar_lower_body.llm
+++ b/indra/newview/character/avatar_lower_body.llm
--- a/indra/newview/character/avatar_lower_body_1.llm
+++ b/indra/newview/character/avatar_lower_body_1.llm
--- a/indra/newview/character/avatar_lower_body_2.llm
+++ b/indra/newview/character/avatar_lower_body_2.llm
--- a/indra/newview/character/avatar_lower_body_3.llm
+++ b/indra/newview/character/avatar_lower_body_3.llm
--- a/indra/newview/character/avatar_lower_body_4.llm
+++ b/indra/newview/character/avatar_lower_body_4.llm