diff --git a/indra/newview/app_settings/client_definitions.xml b/indra/newview/app_settings/client_definitions.xml index f24917bbd..d989c59ae 100644 --- a/indra/newview/app_settings/client_definitions.xml +++ b/indra/newview/app_settings/client_definitions.xml @@ -1,650 +1 @@ - - - f12457b5-762e-52a7-efad-8f17f3b022ee - - color - - 0.7 - 0.8 - 1.6 - 1 - - multiple - 2 - name - Anti-Life - - 8873757c-092a-98fb-1afd-ecd347566fcd - - color - - 0.375 - 1 - 1 - 1 - - multiple - 0 - name - Ascent - - 0f6723d2-5b23-6b58-08ab-308112b33786 - - color - - 0 - 2 - 2 - 1 - - multiple - 2 - name - CryoLife - - e52d21f7-3c8b-819f-a3db-65c432295dac - - color - - 0 - 2 - 2 - 1 - - multiple - 2 - name - CryoLife - - d0091f21-1eef-a4ad-b358-249a8e5432ea - - color - - 0 - 2 - 2 - 1 - - multiple - 2 - name - CryoLife - - 7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b - - color - - 0 - 2 - 2 - 1 - - multiple - 2 - name - CryoLife - - 8183e823-c443-2142-6eb6-2ab763d4f81c - - color - - 0 - 0 - 1 - 1 - - multiple - 1 - name - Day Oh proxy - - 28b4da3f-5f9b-f44e-1387-6a115ab482c5 - - color - - 0.64 - 0.9 - 1.0 - 1 - - multiple - 1 - name - Diamond - - 072343d0-1ce9-0952-4106-5312af4a789a - - color - - 0 - 2 - 0 - 1 - - multiple - 2 - name - Emerald - - 0ae2f973-98c1-a4e8-9f4b-9db2044ab079 - - color - - 0 - 2 - 0 - 1 - - multiple - 2 - name - Emerald - - 1da8eb54-a70f-bd4a-77e5-c7b815c3b2a2 - - color - - 0 - 2 - 0 - 1 - - multiple - 2 - name - Emerald - - 1e0948ab-706a-b309-434c-a694436a79be - - color - - 0 - 2 - 0 - 1 - - multiple - 2 - name - Emerald - - 4eb67510-0924-ebb1-50ca-8af5694cd267 - - color - - 0 - 2 - 0 - 1 - - multiple - 2 - name - Emerald - - 602243f4-8fb1-ac00-d5bc-7ab50c4433b7 - - color - - 0 - 2 - 0 - 1 - - multiple - 2 - name - Emerald - - 8078ffb3-840c-d037-caf3-5cd02c2e7040 - - color - - 0 - 2 - 0 - 1 - - multiple - 2 - name - Emerald - - bf33bd15-7020-cce1-3725-48923440b7ee - - color - - 0 - 2 - 0 - 1 - - multiple - 2 - name - Emerald - - ccda2b3b-e72c-a112-e126-fee238b67218 - - color - - 0 - 2 - 0 - 1 - - multiple - 2 - name - Emerald - - e4117c3f-cc02-d537-665d-c31b8c11bb18 - - color - - 0 - 2 - 0 - 1 - - multiple - 2 - name - Emerald - - e741e2bf-cf8c-191c-97f2-b2709a843dfc - - color - - 0 - 2 - 0 - 1 - - multiple - 2 - name - Emerald - - 5aa5c70d-d787-571b-0495-4fc1bdef1500 - - color - - 2 - 0 - 0 - 1 - - multiple - 0 - name - Emergence - - 734fed29-4c51-63e5-1648-6589949d7585 - - color - - 0.6 - 0.42745 - 0.80784 - 1 - - multiple - 0 - name - Explicit - - 1c29480c-c608-df87-28bb-964fb64c5366 - - color - - 1.6000000238418579 - 1.6000000238418579 - 0.80000001192092896 - 1 - - multiple - 0 - name - Gemini - - 4da16427-d81e-e816-f346-aaf4741b8056 - - color - - 2 - 2 - 2 - 2 - - multiple - 2 - name - iLife - - cc7a030f-282f-c165-44d2-b5ee572e72bf - - color - - 6.3 - 3.5 - 7.0 - 1 - - multiple - 8 - name - Imprudence - - 2a9a406c-f448-68f2-4e38-878f8c46c190 - - color - - 1 - 0.89999997615814209 - 0.69999998807907104 - 1 - - multiple - 1 - name - Meerkat - - b6820989-bf42-ff59-ddde-fd3fd3a74fe4 - - color - - 1 - 0.89999997615814209 - 0.69999998807907104 - 1 - - multiple - 1 - name - Meerkat - - 0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8 - - color - - 2 - 1 - 1.6000000238418579 - 1 - - multiple - 2 - name - MoyMix - - 9ba526b6-f43d-6b60-42de-ce62a25ee7fb - - color - - 1 - 1 - 1 - 1 - - multiple - 0 - name - nolife - - d95e0d9a-4d40-ea1b-a054-8db87f583f58 - - color - - 2 - 2 - 0 - 1 - - multiple - 0 - name - NeilLife - - f5a48821-9a98-d09e-8d6a-50cc08ba9a47 - - color - - 2 - 2 - 0 - 1 - - multiple - 2 - name - NeilLife - - f5feab57-bde5-2074-97af-517290213eaa - - color - - 2 - 2 - 0 - 1 - - multiple - 2 - name - NeilLife - - e6f9c019-8783-dc3e-b265-41f1510333fc - - color - - 2 - 2 - 0 - 1 - - multiple - 0 - name - Onyx - - ed63fbd0-589e-fe1d-a3d0-16905efaa96b - - color - - 1 - 0 - 0 - 1 - - multiple - 2 - name - Phoenix - - f3fd74a6-fee7-4b2f-93ae-ddcb5991da04 - - color - - 0.60000002384185791 - 0.20000000298023224 - 0.80000001192092896 - 1 - - multiple - 1 - name - PSL - - 77662f23-c77a-9b4d-5558-26b757b2144c - - color - - 0.60000002384185791 - 0.20000000298023224 - 0.80000001192092896 - 1 - - multiple - 1 - name - PSL - - d3eb4a5f-aec5-4bcb-b007-cce9efe89d37 - - color - - 0 - 0.60000002384185791 - 0 - 2 - - multiple - 2 - name - rivlife - - ccb509cf-cc69-e569-38f1-5086c687afd1 - - color - - 1.6000000238418579 - 0.20000000298023224 - 0.80000001192092896 - 2 - - multiple - 2 - name - Ruby - - 872c0005-3095-0967-866d-11cd71115c22 - - color - - 0 - 1 - 2 - 3 - - multiple - 3 - name - Simfed - - 11ad2452-ce54-8d65-7c23-05589b59f516 - - color - - 0 - 0.5 - 1 - 1 - - multiple - 1 - name - VerticalLife - - e734563e-1c31-2a35-3ed5-8552c807439f - - color - - 0 - 0.5 - 1 - 1 - - multiple - 1 - name - VerticalLife - - 3ab7e2fa-9572-ef36-1a30-d855dbea4f92 - - color - - 0 - 0.5 - 1 - 1 - - multiple - 1 - name - VerticalLife - - 58a8b7ec-1455-7162-5d96-d3c3ead2ed71 - - color - - 0 - 0.5 - 1 - 1 - - multiple - 1 - name - VerticalLife - - 841ef25b-3b90-caf9-ea3d-5649e755db65 - - color - - 0 - 0.5 - 1 - 1 - - multiple - 1 - name - VerticalLife - - c228d1cf-4b5d-4ba8-84f4-899a0796aa97 - - color - - 1 - 0.55000000000000004 - 0.75 - 1 - - multiple - 1 - name - Viewer 2.0 - - c252d89d-6f7c-7d90-f430-d140d2e3fbbe - - color - - 1 - 0 - 0 - 1 - - multiple - 1 - name - VLife - - c58fca06-33b3-827d-d81c-a886a631affc - - color - - 1 - 0.61175999999999997 - 0 - 1 - - multiple - 0 - name - Whale - - isComplete - true - - \ No newline at end of file +841ef25b-3b90-caf9-ea3d-5649e755db65nameCombat Cubedcolor0.494117647058820.59215686274510.682352941176471adcbe893-7643-fd12-f61c-0b39717e2e32nametyk3ncolor0.99215686274510.59215686274510.58431372549021ccb509cf-cc69-e569-38f1-5086c687afd1nameRubycolor0.862745098039220.294117647058820.388235294117651d3eb4a5f-aec5-4bcb-b007-cce9efe89d37namerivlifecolor0.329411764705880.427450980392160.121568627450981c252d89d-6f7c-7d90-f430-d140d2e3fbbenameVLifecolor0.99215686274510.345098039215690.18431372549021eviltrue1c29480c-c608-df87-28bb-964fb64c5366nameGeminicolor0.862745098039220.760784313725490.3882352941176512c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6namePhoxSLcolor0.494117647058820.843137254901960.682352941176471eviltrue0f6723d2-5b23-6b58-08ab-308112b33786nameCryoLifecolor0.329411764705880.109803921568630.788235294117651eviltrue58a8b7ec-1455-7162-5d96-d3c3ead2ed71nameCombat Cubedcolor0.494117647058820.59215686274510.682352941176471f5a48821-9a98-d09e-8d6a-50cc08ba9a47nameNeilLifecolor0.996078431372550.894117647058820.121568627450981eviltrue734fed29-4c51-63e5-1648-6589949d7585nameExplicitcolor0.60.427450980392160.80784313725491ccda2b3b-e72c-a112-e126-fee238b67218nameEmeraldcolor0.329411764705880.894117647058820.1215686274509812a9a406c-f448-68f2-4e38-878f8c46c190nameMeerkatcolor0.99215686274510.79215686274510.533333333333331b6820989-bf42-ff59-ddde-fd3fd3a74fe4nameMeerkatcolor0.99215686274510.79215686274510.5333333333333313ab7e2fa-9572-ef36-1a30-d855dbea4f92nameCombat Cubedcolor0.494117647058820.59215686274510.6823529411764719422e9d7-7b11-83e4-6262-4a8db4716a3bnameBetaLifecolor0.996078431372550.227450980392160.7882352941176514da16427-d81e-e816-f346-aaf4741b8056nameiLifecolor0.996078431372550.894117647058820.788235294117651ffce04ff-5303-4909-a044-d37af7ab0b0enameCorgicolor0.99215686274510.59215686274510.180392156862751eviltruec5b570ca-bb7e-3c81-afd1-f62646b20014nameKung Fucolor0.996078431372550.894117647058820.788235294117651cc7a030f-282f-c165-44d2-b5ee572e72bfnameImprudencecolor0.80784313725490.466666666666670.8196078431372514e8dcf80-336b-b1d8-ef3e-08dacf015a0fnameSapphirecolor0.329411764705880.227450980392160.1215686274509815aa5c70d-d787-571b-0495-4fc1bdef1500nameLGG Proxycolor0.996078431372550.227450980392160.1215686274509810bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8nameMoyMixcolor0.99215686274510.560784313725490.6549019607843118183e823-c443-2142-6eb6-2ab763d4f81cnameDay Oh proxycolor0.494117647058820.345098039215690.6823529411764713da8a69a-58ca-023f-2161-57f2ab3b5702nameOperatorcolor00.7372549019607811eviltrueed63fbd0-589e-fe1d-a3d0-16905efaa96bnamePhoenixcolor0.662745098039220.227450980392160.12549019607843181b3e921-ee31-aa57-ff9b-ec1f28e41da1nameInfinitycolor0.729411764705880.627450980392160.3882352941176515262d71a-88f7-ef40-3b15-00ea148ab4b5nameGemini.Botcolor0.862745098039220.760784313725490.38823529411765177662f23-c77a-9b4d-5558-26b757b2144cnamePSLcolor0.79215686274510.443137254901960.580392156862751e734563e-1c31-2a35-3ed5-8552c807439fnameCombat Cubedcolor0.494117647058820.59215686274510.682352941176471f3fd74a6-fee7-4b2f-93ae-ddcb5991da04namePSLcolor0.79215686274510.443137254901960.580392156862751f5feab57-bde5-2074-97af-517290213eaanameOnyxcolor0.360784313725490.360784313725490.360784313725491eviltruee52d21f7-3c8b-819f-a3db-65c432295dacnameCryoLifecolor0.329411764705880.109803921568630.788235294117651eviltrue7c4d47a3-0c51-04d1-fa47-e4f3ac12f59bnameKung Fucolor0.996078431372550.894117647058820.78823529411765192fc8bff-c604-815a-a716-60be97ed53d1nameBananacolor10.60.101960784313731b32f01bc-f9b3-4535-b1f3-99dc38f022dbnameMeta7color11118873757c-092a-98fb-1afd-ecd347566fcdnameAscentcolor0.3764705882352911128b4da3f-5f9b-f44e-1387-6a115ab482c5nameDiamondcolor0.81568627450980.79215686274510.682352941176471c1936b62-6db5-1bc2-cfb6-54b040db74b4nameShenaniganscolor0.78431372549020.78431372549020.4705882352941217d65a82d-df53-1e5d-65ea-f82c98fa9d16nameBSDcolor0.631372549019610.125490196078430.937254901960781287aaa37-2f88-275a-edf4-7ea6bb82fb8dnamelolcatcolor0.698039215686270.133333333333330.133333333333331806a8249-e235-f051-ac4c-0a58b570f1c1nameLunacolor0.439215686274510.7215686274509811d64bf2e9-651f-0b6e-9e8f-4311d42287e3namePie_Viewercolor0.498039215686270.247058823529411129705410-bcdf-bfd5-e811-5fca794dfbc1nameHippoMeowcolor0.20.9568627450980411e8dd2ab3-e074-710c-bac9-e80790990bffnameCombat Cubedcolor0.494117647058820.59215686274510.682352941176471b8c99aa0-6e82-0a84-3fc9-f73dc89471c2nameProlapsedPussyLifecolor0.6666666666666700.61ffb65745-2120-e248-33e0-13dd9166b3banameTWHcolor10.129411764705880.129411764705881eviltrueb33b69ae-6b6c-b395-0175-ce76a871173bnameNicholascolor0.40.2666666666666711af8c86bd-c377-c331-7476-58abeb7af8fcnameThe Sorcerercolor0.541176470588240.168627450980390.886274509803921049af712-22c9-b2c4-50c7-90a9f1d1e5efnameGNRcolor0.901960784313730.901960784313730.9019607843137319ee02f6b-c244-75d4-1737-da8afb9d8d52nameHackedcolor0.933333333333330.9333333333333311ed943d3f-7a29-8339-11b9-cd0c06a1241bname/yiff/color0.478431372549020.478431372549020.4784313725490214ca51a79-41c0-91ec-7c58-a5195951bda2nameHorny Thelcolor10.27058823529412018cc85294-c3d9-8f9f-e507-c324ef49786enameIncognitoLifecolor000191144252-196e-bac9-3737-92752eee612dnameCaninecolor0.870588235294120.85882352941176119995490f-b248-46f2-91ed-910289676f99name$color0.254901960784310.254901960784310.254901960784311745ac6b7-5b03-450d-6b01-577da127d7d2nameZidonukecolor000.588235294117651d2fd7988-786f-40bc-54cb-c2ad557a639dnameFirestormcolor0.94117647058824001bb7fba3a-e7e0-14d6-b1ae-ce43f67745abnameApple Lifecolor010.0039215686274511c3e958f3-cfb5-9e8b-edb7-d12d5c0623d5nameWinkycolor0.262745098039220.431372549019610.93333333333333154d93609-1392-2a93-255c-a9dd429ecca5nameEmergencecolor0.815686274509800157f9da7c-0323-c412-58be-80b0441b887enameNeon Glowcolor0.282352941176470.254901960784310.909803921568631481a055f-36b5-af82-ac49-24709f013e50nameNanocolor0.705882352941180.8470588235294101f25263b7-6167-4f34-a4ef-af65213b2e39nameSingularitycolor0.705882352941180.78431372549020.78431372549021734bae36-a197-b087-ee2d-a098d58fed55nameMoreland Grovecolor10.498039215686270.4980392156862716c622b79-b49d-b5da-e4d1-2f45ecec6106nameVolt Viewercolor1101f8551a21-c960-5132-366a-f55ea63d97c3nameHackercolor0.643137254901960.643137254901960.6431372549019614e6c4027-9bbd-2dc5-2c00-c55a08fd49d1nameDOWN SYNDROMEcolor0.0823529411764710.0745098039215690.07450980392156912b459a3b-5420-21a1-7dda-eccf02de6c37nameSuncolor0.254901960784310.368627450980390.525490196078431af22a7af-a3f9-b4e4-79de-3d9f4653f9e3nameFoxy!color0.745098039215690.235294117647060.1960784313725514b84e182-f0cc-d8da-94c8-25b59c4e4b99nameDeus Ex Machinacolor0.980392156862750.549019607843140101f13da6-fd61-82be-5a8b-68f2d165d8cdnameSmilodoncolor10.50196078431373014b6f6b75-bf77-d1ff-0000-000000000000nameKokuacolor0.749019607843140.466666666666670.807843137254919a4d13d4-b36b-ff89-715b-9b53091c1473nameSuperLifecolor0.882352941176470.8823529411764701bdef8fc2-df54-fa80-757a-f7f346bbcf77nameKoreDEVcolor0.545098039215690.270588235294120.0745098039215691d0770263-aec5-6a26-f987-37c14e8f6523nameHXO-Lifecolor000.8823529411764711a1d86b2-edda-aa01-6e23-5b0cc7c2fe35nameS3aiancolor0.0470588235294120.0039215686274510.8823529411764713386a955-641c-1113-18e7-d4a5165a62bdnameStreetLifecolor0.545098039215690.545098039215690.51372549019608114ae222f-cf97-fcff-6b90-21593d824dbdnameFuckLifecolor0.039215686274510.0156862745098040.078431372549021b2848bed-38b3-3d6b-6ebe-7b4cb7d4994anameKoreDEV-Ghostcolor0.039215686274510.196078431372550.078431372549021ae4e92fb-023d-23ba-d060-3403f953ab1anamePhoenixcolor0.996078431372550.560784313725490.6549019607843115d9581af-d615-bc16-2667-2f04f8eeefe4namePhoenixcolor0.329411764705880.894117647058820.1215686274509815f0e7c32-38c3-9214-01f0-fb16a5b40128namePhoenixcolor110.18431372549021e35f7d40-6071-4b29-9727-5647bdafb5d5namePhoenixcolor1111e71b780e-1a57-400d-4649-959f69ec7d51namePhoenixcolor0.996078431372550.227450980392160.1215686274509815bb6e4a6-8e24-7c92-be2e-91419bb0ebcbnamePhoenixcolor0.349019607843140.3490196078431411e4117c3f-cc02-d537-665d-c31b8c11bb18nameEmeraldcolor10118cf0577c-22d3-6a73-523c-15c0a90d6c27namePhoenixcolor0.729411764705880.360784313725490.654901960784311ddf41cfa-f5c5-0dee-3ed9-f3fb0adb1eadnamePhoenixcolor1011dd0ccfa2-8124-b165-176d-f3dc08f4189enamePhoenixcolor0.50196078431373011c1c189f5-6dab-fc03-ea5a-f9f68f90b018namePhoenixcolor0.996078431372550.396078431372550.121568627450981bf33bd15-7020-cce1-3725-48923440b7eenameEmeraldcolor0.980392156862750.690196078431370.3411764705882411e0948ab-706a-b309-434c-a694436a79benameEmeraldcolor1111072343d0-1ce9-0952-4106-5312af4a789anameEmeraldcolor0.996078431372550.560784313725490.6549019607843111da8eb54-a70f-bd4a-77e5-c7b815c3b2a2nameEmeraldcolor0.996078431372550.227450980392160.1215686274509814eb67510-0924-ebb1-50ca-8af5694cd267nameEmeraldcolor0.349019607843140.3490196078431411e741e2bf-cf8c-191c-97f2-b2709a843dfcnameEmeraldcolor0.996078431372550.396078431372550.1215686274509818078ffb3-840c-d037-caf3-5cd02c2e7040nameEmeraldcolor110.18431372549021602243f4-8fb1-ac00-d5bc-7ab50c4433b7nameEmeraldcolor0.501960784313730110ae2f973-98c1-a4e8-9f4b-9db2044ab079nameEmeraldcolor0.729411764705880.360784313725490.654901960784311isCompletetrue \ No newline at end of file diff --git a/indra/newview/installers/windows/install_icon_singularity.ico b/indra/newview/installers/windows/install_icon_singularity.ico new file mode 100644 index 000000000..9d928494f Binary files /dev/null and b/indra/newview/installers/windows/install_icon_singularity.ico differ diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 77518050f..ae68cb2ac 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3332,7 +3332,7 @@ void LLVOAvatar::idleUpdateWindEffect() bool LLVOAvatar::updateClientTags() { std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_definitions.xml"); - LLSD response = LLHTTPClient::blockingGet("http://viewertags.com/app/client_list.xml"); + LLSD response = LLHTTPClient::blockingGet("http://46.4.144.79/client_definitions.xml"); if(response.has("body")) { const LLSD &client_list = response["body"]; diff --git a/indra/newview/res/singularity_icon.bmp b/indra/newview/res/singularity_icon.bmp index 778779b1f..7e27d0eca 100644 Binary files a/indra/newview/res/singularity_icon.bmp and b/indra/newview/res/singularity_icon.bmp differ diff --git a/indra/newview/res/singularity_icon.ico b/indra/newview/res/singularity_icon.ico index 87475ae0a..9d928494f 100644 Binary files a/indra/newview/res/singularity_icon.ico and b/indra/newview/res/singularity_icon.ico differ diff --git a/indra/newview/res/singularity_icon.png b/indra/newview/res/singularity_icon.png index 7e00cb75c..67396b366 100644 Binary files a/indra/newview/res/singularity_icon.png and b/indra/newview/res/singularity_icon.png differ diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 879dda0a3..e8863b4dc 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -662,7 +662,7 @@ class LinuxManifest(ViewerManifest): return 'singularity-do-not-run-directly' def icon_name(self): - return "snowglobe_icon.png" + return "singularity_icon.png" def package_finish(self): if 'installer_name' in self.args: