Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future

Conflicts: indra/llvfs/lldiriterator.cpp indra/newview/app_settings/settings.xml indra/newview/llviewerregion.cpp
2011-07-21 00:20:06 +02:00
parent 2dd733cbaa fe0cd9f702
commit f30c284063
339 changed files with 8700 additions and 4498 deletions
--- a/indra/newview/skins/default/textures/0187babf-6c0d-5891-ebed-4ecab1426683.j2c
+++ b/indra/newview/skins/default/textures/0187babf-6c0d-5891-ebed-4ecab1426683.j2c
--- a/indra/newview/skins/default/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga
+++ b/indra/newview/skins/default/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga
--- a/indra/newview/skins/default/textures/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c
+++ b/indra/newview/skins/default/textures/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c
--- a/indra/newview/skins/default/textures/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c
+++ b/indra/newview/skins/default/textures/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c
--- a/indra/newview/skins/default/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga
+++ b/indra/newview/skins/default/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga
--- a/indra/newview/skins/default/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga
+++ b/indra/newview/skins/default/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga
--- a/indra/newview/skins/default/textures/0a94b42f-ec84-5f9c-14b7-1ef8505ceead.j2c
+++ b/indra/newview/skins/default/textures/0a94b42f-ec84-5f9c-14b7-1ef8505ceead.j2c
--- a/indra/newview/skins/default/textures/0b444c3a-75c2-4891-9d1e-ac35c8d13d62.j2c
+++ b/indra/newview/skins/default/textures/0b444c3a-75c2-4891-9d1e-ac35c8d13d62.j2c
--- a/indra/newview/skins/default/textures/0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c
+++ b/indra/newview/skins/default/textures/0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c
--- a/indra/newview/skins/default/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga
+++ b/indra/newview/skins/default/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga
--- a/indra/newview/skins/default/textures/0ff70ead-4562-45f9-9e8a-52b1a3286868.j2c
+++ b/indra/newview/skins/default/textures/0ff70ead-4562-45f9-9e8a-52b1a3286868.j2c
--- a/indra/newview/skins/default/textures/10d2a01a-0818-84b9-4b96-c2eb63256519.j2c
+++ b/indra/newview/skins/default/textures/10d2a01a-0818-84b9-4b96-c2eb63256519.j2c
--- a/indra/newview/skins/default/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga
+++ b/indra/newview/skins/default/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga
--- a/indra/newview/skins/default/textures/11ee27f5-43c0-414e-afd5-d7f5688c351f.j2c
+++ b/indra/newview/skins/default/textures/11ee27f5-43c0-414e-afd5-d7f5688c351f.j2c
--- a/indra/newview/skins/default/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga
+++ b/indra/newview/skins/default/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga
--- a/indra/newview/skins/default/textures/179cdabd-398a-9b6b-1391-4dc333ba321f.j2c
+++ b/indra/newview/skins/default/textures/179cdabd-398a-9b6b-1391-4dc333ba321f.j2c
--- a/indra/newview/skins/default/textures/18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c
+++ b/indra/newview/skins/default/textures/18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c
--- a/indra/newview/skins/default/textures/19c76b49-c5f4-aeca-7cd8-17010f2969c3.j2c
+++ b/indra/newview/skins/default/textures/19c76b49-c5f4-aeca-7cd8-17010f2969c3.j2c
--- a/indra/newview/skins/default/textures/1e63e323-5fe0-452e-92f8-b98bd0f764e3.j2c
+++ b/indra/newview/skins/default/textures/1e63e323-5fe0-452e-92f8-b98bd0f764e3.j2c
--- a/indra/newview/skins/default/textures/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c
+++ b/indra/newview/skins/default/textures/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c
--- a/indra/newview/skins/default/textures/28f0f9ca-0423-4d1b-9e76-616ffce99544.j2c
+++ b/indra/newview/skins/default/textures/28f0f9ca-0423-4d1b-9e76-616ffce99544.j2c
--- a/indra/newview/skins/default/textures/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c
+++ b/indra/newview/skins/default/textures/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c
--- a/indra/newview/skins/default/textures/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c
+++ b/indra/newview/skins/default/textures/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c
--- a/indra/newview/skins/default/textures/2d784476-d0db-9979-0cff-9408745a7cf3.j2c
+++ b/indra/newview/skins/default/textures/2d784476-d0db-9979-0cff-9408745a7cf3.j2c
--- a/indra/newview/skins/default/textures/30047cec-269d-408e-0c30-b2603b887268.j2c
+++ b/indra/newview/skins/default/textures/30047cec-269d-408e-0c30-b2603b887268.j2c
--- a/indra/newview/skins/default/textures/303cd381-8560-7579-23f1-f0a880799740.j2c
+++ b/indra/newview/skins/default/textures/303cd381-8560-7579-23f1-f0a880799740.j2c
--- a/indra/newview/skins/default/textures/335f8f14-f2db-db7c-1c04-734dc7657439.j2c
+++ b/indra/newview/skins/default/textures/335f8f14-f2db-db7c-1c04-734dc7657439.j2c
--- a/indra/newview/skins/default/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga
+++ b/indra/newview/skins/default/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga
--- a/indra/newview/skins/default/textures/35f217a3-f618-49cf-bbca-c86d486551a9.j2c
+++ b/indra/newview/skins/default/textures/35f217a3-f618-49cf-bbca-c86d486551a9.j2c
--- a/indra/newview/skins/default/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga
+++ b/indra/newview/skins/default/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga
--- a/indra/newview/skins/default/textures/39801651-26cb-4926-af57-7af9352c273c.tga
+++ b/indra/newview/skins/default/textures/39801651-26cb-4926-af57-7af9352c273c.tga
--- a/indra/newview/skins/default/textures/3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef.j2c
+++ b/indra/newview/skins/default/textures/3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef.j2c
--- a/indra/newview/skins/default/textures/3cddf591-a726-4702-87b3-70c1daf88f90.j2c
+++ b/indra/newview/skins/default/textures/3cddf591-a726-4702-87b3-70c1daf88f90.j2c
--- a/indra/newview/skins/default/textures/402f8b24-5f9d-4905-b5f8-37baff603e88.j2c
+++ b/indra/newview/skins/default/textures/402f8b24-5f9d-4905-b5f8-37baff603e88.j2c
--- a/indra/newview/skins/default/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga
+++ b/indra/newview/skins/default/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga
--- a/indra/newview/skins/default/textures/4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c
+++ b/indra/newview/skins/default/textures/4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c
--- a/indra/newview/skins/default/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga
+++ b/indra/newview/skins/default/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga
--- a/indra/newview/skins/default/textures/48766d75-6e58-de84-68fe-1980c64feaee.j2c
+++ b/indra/newview/skins/default/textures/48766d75-6e58-de84-68fe-1980c64feaee.j2c
--- a/indra/newview/skins/default/textures/53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c
+++ b/indra/newview/skins/default/textures/53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c
--- a/indra/newview/skins/default/textures/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c
+++ b/indra/newview/skins/default/textures/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c
--- a/indra/newview/skins/default/textures/5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508.j2c
+++ b/indra/newview/skins/default/textures/5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508.j2c
--- a/indra/newview/skins/default/textures/5abfabc2-5d6d-4912-acd8-d7e38ae93d02.j2c
+++ b/indra/newview/skins/default/textures/5abfabc2-5d6d-4912-acd8-d7e38ae93d02.j2c
--- a/indra/newview/skins/default/textures/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c
+++ b/indra/newview/skins/default/textures/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c
--- a/indra/newview/skins/default/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga
+++ b/indra/newview/skins/default/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga
--- a/indra/newview/skins/default/textures/63338ede-0037-c4fd-855b-015d77112fc8.j2c
+++ b/indra/newview/skins/default/textures/63338ede-0037-c4fd-855b-015d77112fc8.j2c
--- a/indra/newview/skins/default/textures/64367bd1-697e-b3e6-0b65-3f862a577366.j2c
+++ b/indra/newview/skins/default/textures/64367bd1-697e-b3e6-0b65-3f862a577366.j2c
--- a/indra/newview/skins/default/textures/64eed6af-f575-35c7-baa4-b140bdcdb00f.j2c
+++ b/indra/newview/skins/default/textures/64eed6af-f575-35c7-baa4-b140bdcdb00f.j2c
--- a/indra/newview/skins/default/textures/6522e74d-1660-4e7f-b601-6f48c1659a77.j2c
+++ b/indra/newview/skins/default/textures/6522e74d-1660-4e7f-b601-6f48c1659a77.j2c
--- a/indra/newview/skins/default/textures/67931331-0c02-4876-1255-28770896c6a2.j2c
+++ b/indra/newview/skins/default/textures/67931331-0c02-4876-1255-28770896c6a2.j2c
--- a/indra/newview/skins/default/textures/6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c
+++ b/indra/newview/skins/default/textures/6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c
--- a/indra/newview/skins/default/textures/6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c
+++ b/indra/newview/skins/default/textures/6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c
--- a/indra/newview/skins/default/textures/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c
+++ b/indra/newview/skins/default/textures/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c
--- a/indra/newview/skins/default/textures/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c
+++ b/indra/newview/skins/default/textures/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c
--- a/indra/newview/skins/default/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga
+++ b/indra/newview/skins/default/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga
--- a/indra/newview/skins/default/textures/74ba3584-58ea-9984-5b76-62d37942ab77.tga
+++ b/indra/newview/skins/default/textures/74ba3584-58ea-9984-5b76-62d37942ab77.tga
--- a/indra/newview/skins/default/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga
+++ b/indra/newview/skins/default/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga
--- a/indra/newview/skins/default/textures/7581f2f4-d0d2-481a-bc75-69a13d9caeaa.j2c
+++ b/indra/newview/skins/default/textures/7581f2f4-d0d2-481a-bc75-69a13d9caeaa.j2c
--- a/indra/newview/skins/default/textures/78af921a-3c49-47a1-9c4e-2608951164ae.j2c
+++ b/indra/newview/skins/default/textures/78af921a-3c49-47a1-9c4e-2608951164ae.j2c
--- a/indra/newview/skins/default/textures/79504bf5-c3ec-0763-6563-d843de66d0a1.j2c
+++ b/indra/newview/skins/default/textures/79504bf5-c3ec-0763-6563-d843de66d0a1.j2c
--- a/indra/newview/skins/default/textures/7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c
+++ b/indra/newview/skins/default/textures/7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c
--- a/indra/newview/skins/default/textures/7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c
+++ b/indra/newview/skins/default/textures/7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c
--- a/indra/newview/skins/default/textures/7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c
+++ b/indra/newview/skins/default/textures/7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c
--- a/indra/newview/skins/default/textures/7cb070bc-fc00-4527-9c4d-7f7e0c4191be.j2c
+++ b/indra/newview/skins/default/textures/7cb070bc-fc00-4527-9c4d-7f7e0c4191be.j2c
--- a/indra/newview/skins/default/textures/822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c
+++ b/indra/newview/skins/default/textures/822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c
--- a/indra/newview/skins/default/textures/827ff765-8c1d-a8b1-23f7-fdcba560effc.j2c
+++ b/indra/newview/skins/default/textures/827ff765-8c1d-a8b1-23f7-fdcba560effc.j2c
--- a/indra/newview/skins/default/textures/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c
+++ b/indra/newview/skins/default/textures/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c
--- a/indra/newview/skins/default/textures/8872f2b8-31db-42d8-580a-b3e4a91262de.j2c
+++ b/indra/newview/skins/default/textures/8872f2b8-31db-42d8-580a-b3e4a91262de.j2c
--- a/indra/newview/skins/default/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga
+++ b/indra/newview/skins/default/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga
--- a/indra/newview/skins/default/textures/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c
+++ b/indra/newview/skins/default/textures/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c
--- a/indra/newview/skins/default/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c
+++ b/indra/newview/skins/default/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c
--- a/indra/newview/skins/default/textures/8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c
+++ b/indra/newview/skins/default/textures/8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c
--- a/indra/newview/skins/default/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga
+++ b/indra/newview/skins/default/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga
--- a/indra/newview/skins/default/textures/92e66e00-f56f-598a-7997-048aa64cde18.j2c
+++ b/indra/newview/skins/default/textures/92e66e00-f56f-598a-7997-048aa64cde18.j2c
--- a/indra/newview/skins/default/textures/95281d5c-d27a-ee13-e067-08295b67b58a.j2c
+++ b/indra/newview/skins/default/textures/95281d5c-d27a-ee13-e067-08295b67b58a.j2c
--- a/indra/newview/skins/default/textures/96b4de31-f4fa-337d-ec78-451e3609769e.j2c
+++ b/indra/newview/skins/default/textures/96b4de31-f4fa-337d-ec78-451e3609769e.j2c
--- a/indra/newview/skins/default/textures/978380f0-aaf7-c459-14e3-9808833fd372.j2c
+++ b/indra/newview/skins/default/textures/978380f0-aaf7-c459-14e3-9808833fd372.j2c
--- a/indra/newview/skins/default/textures/988dd995-1769-bdc9-8842-51f8f2b03884.j2c
+++ b/indra/newview/skins/default/textures/988dd995-1769-bdc9-8842-51f8f2b03884.j2c
--- a/indra/newview/skins/default/textures/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c
+++ b/indra/newview/skins/default/textures/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c
--- a/indra/newview/skins/default/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga
+++ b/indra/newview/skins/default/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga
--- a/indra/newview/skins/default/textures/9c88539c-fd04-46b8-bea2-ddf1bcffe3bd.j2c
+++ b/indra/newview/skins/default/textures/9c88539c-fd04-46b8-bea2-ddf1bcffe3bd.j2c
--- a/indra/newview/skins/default/textures/9deab416-9c63-78d6-d558-9a156f12044c.j2c
+++ b/indra/newview/skins/default/textures/9deab416-9c63-78d6-d558-9a156f12044c.j2c
--- a/indra/newview/skins/default/textures/a6162133-724b-54df-a12f-51cd070ad6f3.j2c
+++ b/indra/newview/skins/default/textures/a6162133-724b-54df-a12f-51cd070ad6f3.j2c
--- a/indra/newview/skins/default/textures/a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c
+++ b/indra/newview/skins/default/textures/a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c
--- a/indra/newview/skins/default/textures/abb783e6-3e93-26c0-248a-247666855da3.j2c
+++ b/indra/newview/skins/default/textures/abb783e6-3e93-26c0-248a-247666855da3.j2c
--- a/indra/newview/skins/default/textures/ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c
+++ b/indra/newview/skins/default/textures/ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c
--- a/indra/newview/skins/default/textures/b2ef2d31-9714-a07b-6ca7-31638166364b.tga
+++ b/indra/newview/skins/default/textures/b2ef2d31-9714-a07b-6ca7-31638166364b.tga
--- a/indra/newview/skins/default/textures/b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d.j2c
+++ b/indra/newview/skins/default/textures/b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d.j2c
--- a/indra/newview/skins/default/textures/b8d3965a-ad78-bf43-699b-bff8eca6c975.j2c
+++ b/indra/newview/skins/default/textures/b8d3965a-ad78-bf43-699b-bff8eca6c975.j2c
--- a/indra/newview/skins/default/textures/b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c
+++ b/indra/newview/skins/default/textures/b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c
--- a/indra/newview/skins/default/textures/b9e1cf8a-9660-c020-0c69-18f1ea27268a.j2c
+++ b/indra/newview/skins/default/textures/b9e1cf8a-9660-c020-0c69-18f1ea27268a.j2c
--- a/indra/newview/skins/default/textures/b9f1a3b8-933e-b7c8-e6f5-dba1bc666bed.j2c
+++ b/indra/newview/skins/default/textures/b9f1a3b8-933e-b7c8-e6f5-dba1bc666bed.j2c
--- a/indra/newview/skins/default/textures/beb169c7-11ea-fff2-efe5-0f24dc881df2.j2c
+++ b/indra/newview/skins/default/textures/beb169c7-11ea-fff2-efe5-0f24dc881df2.j2c
--- a/indra/newview/skins/default/textures/c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d.j2c
+++ b/indra/newview/skins/default/textures/c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d.j2c
--- a/indra/newview/skins/default/textures/ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c
+++ b/indra/newview/skins/default/textures/ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c
--- a/indra/newview/skins/default/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga
+++ b/indra/newview/skins/default/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga
--- a/indra/newview/skins/default/textures/cce0f112-878f-4586-a2e2-a8f104bba271.j2c
+++ b/indra/newview/skins/default/textures/cce0f112-878f-4586-a2e2-a8f104bba271.j2c
--- a/indra/newview/skins/default/textures/cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c
+++ b/indra/newview/skins/default/textures/cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c
--- a/indra/newview/skins/default/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c
+++ b/indra/newview/skins/default/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c
--- a/indra/newview/skins/default/textures/d2114404-dd59-4a4d-8e6c-49359e91bbf0.j2c
+++ b/indra/newview/skins/default/textures/d2114404-dd59-4a4d-8e6c-49359e91bbf0.j2c
--- a/indra/newview/skins/default/textures/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c
+++ b/indra/newview/skins/default/textures/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c
--- a/Show More
+++ b/Show More