diff --git a/indra/newview/app_settings/client_definitions.xml b/indra/newview/app_settings/client_definitions.xml index 2b574e5b8..613419478 100644 --- a/indra/newview/app_settings/client_definitions.xml +++ b/indra/newview/app_settings/client_definitions.xml @@ -1,6 +1,6 @@ - 8873757c-092a-98fb-1afd-ecd347566fcd + 8873757c-092a-98fb-1afd-ecd347566fcd color @@ -9,182 +9,182 @@ 1 1 - multiple + multiple 0 - name + name Ascent - f12457b5-762e-52a7-efad-8f17f3b022ee + f12457b5-762e-52a7-efad-8f17f3b022ee color - 0.69999999999999996 - 0.80000000000000004 - 1.6000000238418579 + 0.7 + 0.8 + 1.6 1 - multiple + multiple 2 - name + name Anti-Life - 0f6723d2-5b23-6b58-08ab-308112b33786 + 0f6723d2-5b23-6b58-08ab-308112b33786 - color + color 0 2 2 1 - multiple + multiple 2 - name + name CryoLife - e52d21f7-3c8b-819f-a3db-65c432295dac + e52d21f7-3c8b-819f-a3db-65c432295dac - color + color 0 2 2 1 - multiple + multiple 2 - name + name CryoLife - d0091f21-1eef-a4ad-b358-249a8e5432ea + d0091f21-1eef-a4ad-b358-249a8e5432ea - color + color 0 2 2 1 - multiple + multiple 2 - name + name CryoLife - 7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b + 7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b - color + color 0 2 2 1 - multiple + multiple 2 - name + name CryoLife - 8183e823-c443-2142-6eb6-2ab763d4f81c + 8183e823-c443-2142-6eb6-2ab763d4f81c - color + color 0 0 1 1 - multiple + multiple 1 - name + name Day Oh proxy - 28b4da3f-5f9b-f44e-1387-6a115ab482c5 - - color - - 0.64314000000000004 - 0.89803999999999995 - 0.99607999999999997 + 28b4da3f-5f9b-f44e-1387-6a115ab482c5 + + color + + 0.64 + 0.9 + 1.0 + 1 + + multiple 1 - - multiple - 1 - name - Diamond - - 072343d0-1ce9-0952-4106-5312af4a789a + name + Diamond + + 072343d0-1ce9-0952-4106-5312af4a789a - color + color 0 2 0 1 - multiple + multiple 2 - name + name Emerald - 0ae2f973-98c1-a4e8-9f4b-9db2044ab079 + 0ae2f973-98c1-a4e8-9f4b-9db2044ab079 - color + color 0 2 0 1 - multiple + multiple 2 - name + name Emerald - 1da8eb54-a70f-bd4a-77e5-c7b815c3b2a2 + 1da8eb54-a70f-bd4a-77e5-c7b815c3b2a2 - color + color 0 2 0 1 - multiple + multiple 2 - name + name Emerald - 1e0948ab-706a-b309-434c-a694436a79be + 1e0948ab-706a-b309-434c-a694436a79be - color + color 0 2 0 1 - multiple + multiple 2 - name + name Emerald - 4eb67510-0924-ebb1-50ca-8af5694cd267 + 4eb67510-0924-ebb1-50ca-8af5694cd267 - color + color 0 2 0 1 - multiple + multiple 2 - name + name Emerald - 602243f4-8fb1-ac00-d5bc-7ab50c4433b7 + 602243f4-8fb1-ac00-d5bc-7ab50c4433b7 - color + color 0 2 @@ -280,7 +280,7 @@ name Emergence - 734fed29-4c51-63e5-1648-6589949d7585 + 734fed29-4c51-63e5-1648-6589949d7585 color @@ -392,21 +392,7 @@ name nolife - 77662f23-c77a-9b4d-5558-26b757b2144c - - color - - 0.60000002384185791 - 0.20000000298023224 - 0.80000001192092896 - 1 - - multiple - 1 - name - PSL - - d95e0d9a-4d40-ea1b-a054-8db87f583f58 + d95e0d9a-4d40-ea1b-a054-8db87f583f58 color @@ -462,7 +448,7 @@ name Onyx - ed63fbd0-589e-fe1d-a3d0-16905efaa96b + ed63fbd0-589e-fe1d-a3d0-16905efaa96b color @@ -478,6 +464,20 @@ 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 @@ -518,21 +518,49 @@ name Ruby - 872c0005-3095-0967-866d-11cd71115c22 + 872c0005-3095-0967-866d-11cd71115c22 - color + color 0 1 2 3 - multiple + multiple 3 - name + name Simfed - 11ad2452-ce54-8d65-7c23-05589b59f516 + 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 @@ -541,110 +569,82 @@ 1 1 - multiple + multiple 1 - name + name VerticalLife - e734563e-1c31-2a35-3ed5-8552c807439f + 58a8b7ec-1455-7162-5d96-d3c3ead2ed71 - color + color 0 0.5 1 1 - multiple + multiple 1 - name + name VerticalLife - 3ab7e2fa-9572-ef36-1a30-d855dbea4f92 + 841ef25b-3b90-caf9-ea3d-5649e755db65 - color + color 0 0.5 1 1 - multiple + multiple 1 - name + name VerticalLife - 58a8b7ec-1455-7162-5d96-d3c3ead2ed71 + c228d1cf-4b5d-4ba8-84f4-899a0796aa97 - 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 + color 1 0.55000000000000004 0.75 1 - multiple + multiple 1 - name + name Viewer 2.0 - c252d89d-6f7c-7d90-f430-d140d2e3fbbe + c252d89d-6f7c-7d90-f430-d140d2e3fbbe - color + color 1 0 0 1 - multiple + multiple 1 - name + name VLife - c58fca06-33b3-827d-d81c-a886a631affc + c58fca06-33b3-827d-d81c-a886a631affc - color + color 1 0.61175999999999997 0 1 - multiple + multiple 0 - name + name Whale - isComplete - true + isComplete + true diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 661a3fbee..f49c15cb0 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3246,7 +3246,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://ascent.balseraph.org/updates/client_definitions.xml"); + LLSD response = LLHTTPClient::blockingGet("http://ascentviewer.com/updates/client_definitions.xml"); if(response.has("body")) { const LLSD &client_list = response["body"];