Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ManagedMarketplace' of https://github.com/Lirusaito/SingularityViewer into ManagedMarketplace

Browse Source
This commit is contained in:
Damian Zhaoying
2019-03-12 01:28:45 -03:00
parent 03d4dde6a4 68fd65b55a
commit 8bbb6cf541
6 changed files with 312 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

395
indra/newview/app_settings/ca-bundle.crt
View File

@@ -16,6 +16,301 @@
## Conversion done with mk-ca-bundle.pl version 1.27.
## SHA256: a3ac15b98179dd2f3c5de076d10b1d53048754372f7207c2f327510cdd78fbd8
##
LetsEncrypt Root CA2
Certificate:
Data:
Version: 3 (0x2)
Serial Number:
03:74:f1:c1:0b:b8:be:e9:c5:30:d3:e4:43:db:f8:ff:05:0d
Signature Algorithm: sha256WithRSAEncryption
Issuer: C = US, O = Let's Encrypt, CN = Let's Encrypt Authority X3
Validity
Not Before: Mar 10 21:26:03 2019 GMT
Not After : Jun 8 21:26:03 2019 GMT
Subject: CN = login.virtual-nexus.xyz
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
RSA Public-Key: (4096 bit)
Modulus:
00:aa:ea:b2:94:3e:9e:bf:08:c7:9a:3b:93:9d:4a:
a4:8e:18:f1:60:a1:26:d1:78:c1:72:11:8e:da:3e:
fa:16:3a:f4:a4:b2:de:ee:ec:eb:86:f1:88:2e:78:
1a:04:90:44:e4:c2:72:c3:85:cf:8e:3b:9a:cd:f6:
2c:4e:cb:39:06:18:2a:b9:70:dd:a5:d0:d6:71:01:
e8:e6:cc:f4:86:dd:88:2b:d5:de:28:a4:6c:a2:c9:
ab:dd:8b:0f:12:2a:1d:67:0f:fe:02:f9:33:1e:0c:
84:be:16:d2:f2:b0:4d:b3:54:3d:db:df:83:8d:9a:
1e:16:46:0b:f5:42:fb:91:4b:6a:95:7e:6b:48:e3:
86:d8:60:5d:4d:9a:4e:a6:82:e7:05:02:83:78:72:
b4:62:8b:27:30:3a:20:8f:72:95:58:56:45:43:db:
4e:e3:4a:87:0a:c9:58:f9:ec:63:65:d4:eb:f7:1d:
cc:2b:5c:8d:7d:61:54:0f:83:78:9a:b3:bf:db:87:
45:b9:99:9b:54:75:e8:1c:52:29:f8:37:ad:24:5a:
ca:2b:1a:b2:11:8e:d4:34:bb:00:a8:e2:ae:ed:34:
14:30:13:e1:06:c5:ee:d4:b2:9b:94:8d:f5:dc:2b:
a0:d3:ab:35:32:8b:e5:cf:d5:44:68:69:5d:3f:22:
86:c9:2d:14:b6:b1:82:0c:fe:87:4d:a0:0a:76:1d:
c3:be:b9:ff:6e:c4:9e:f7:2d:d2:f5:ad:4d:aa:7f:
4e:44:d6:7b:b4:6a:d0:71:52:48:2c:30:bf:11:b5:
df:70:40:30:cc:1a:e4:c0:a0:90:86:56:bf:36:92:
2a:00:a5:0d:3b:2d:42:29:c1:4c:d6:9f:47:83:ff:
c1:c4:cc:04:08:9f:8b:2c:ca:4c:f5:d4:a5:38:81:
6a:d0:4d:68:d9:fb:fa:1e:de:a1:c2:47:ea:d4:a8:
a3:b2:ba:47:50:b4:0e:15:a7:a7:ac:e2:a4:21:7c:
20:c3:6b:ef:4f:3d:57:d0:91:ce:19:b2:da:4d:cd:
7f:2d:2e:12:9d:e8:55:fc:02:ad:ea:57:68:d6:f9:
96:9f:85:98:56:10:a2:bb:b6:7b:24:34:ab:9d:d7:
c9:56:47:40:b5:b1:22:80:b1:ae:37:73:6c:94:93:
6c:db:97:47:b1:86:3c:87:5d:ad:52:2a:44:16:ce:
0c:5c:94:1d:c2:cd:17:76:89:9a:ec:80:78:b9:a9:
c7:90:d2:c6:de:22:bb:95:1e:f6:ad:04:a0:46:c9:
4b:12:2e:8d:ff:89:6c:c8:69:91:78:a0:f3:cf:f2:
22:7d:68:4e:ee:32:0f:61:17:09:ba:94:bd:88:6d:
a8:65:cd
Exponent: 65537 (0x10001)
X509v3 extensions:
X509v3 Key Usage: critical
Digital Signature, Key Encipherment
X509v3 Extended Key Usage:
TLS Web Server Authentication, TLS Web Client Authentication
X509v3 Basic Constraints: critical
CA:FALSE
X509v3 Subject Key Identifier:
2D:36:69:83:B8:E4:7D:38:D1:8F:8B:92:9E:A8:FD:6B:E9:25:29:97
X509v3 Authority Key Identifier:
keyid:A8:4A:6A:63:04:7D:DD:BA:E6:D1:39:B7:A6:45:65:EF:F3:A8:EC:A1
Authority Information Access:
OCSP - URI:http://ocsp.int-x3.letsencrypt.org
CA Issuers - URI:http://cert.int-x3.letsencrypt.org/
X509v3 Subject Alternative Name:
DNS:login.virtual-nexus.xyz
X509v3 Certificate Policies:
Policy: 2.23.140.1.2.1
Policy: 1.3.6.1.4.1.44947.1.1.1
CPS: http://cps.letsencrypt.org
CT Precertificate SCTs:
Signed Certificate Timestamp:
Version : v1 (0x0)
Log ID : 74:7E:DA:83:31:AD:33:10:91:21:9C:CE:25:4F:42:70:
C2:BF:FD:5E:42:20:08:C6:37:35:79:E6:10:7B:CC:56
Timestamp : Mar 10 22:26:03.415 2019 GMT
Extensions: none
Signature : ecdsa-with-SHA256
30:45:02:21:00:98:49:3F:B0:C4:66:2D:CF:CE:91:36:
15:AF:75:94:5B:FD:C2:CB:8F:F1:E2:8D:FA:C0:61:8E:
E6:F3:7B:A8:05:02:20:62:39:0F:66:B2:79:48:A8:49:
41:2A:D4:59:86:C3:FA:AC:C1:5D:26:02:AC:E3:D8:C8:
0F:40:34:64:F1:D1:36
Signed Certificate Timestamp:
Version : v1 (0x0)
Log ID : 29:3C:51:96:54:C8:39:65:BA:AA:50:FC:58:07:D4:B7:
6F:BF:58:7A:29:72:DC:A4:C3:0C:F4:E5:45:47:F4:78
Timestamp : Mar 10 22:26:03.442 2019 GMT
Extensions: none
Signature : ecdsa-with-SHA256
30:46:02:21:00:C7:09:49:5A:96:E5:B5:15:2A:F1:EA:
03:A4:7D:10:89:23:9A:C2:C9:9F:35:85:AD:87:11:58:
A8:95:5C:0A:C6:02:21:00:88:14:C8:48:C7:6B:96:DB:
A2:AB:91:BD:F7:3D:AD:FA:37:F6:AD:BF:D7:24:DC:F0:
11:CF:0C:D4:42:E0:72:A5
Signature Algorithm: sha256WithRSAEncryption
42:55:9f:ea:ae:79:1d:9d:e9:06:23:a1:d0:a9:0f:d2:bc:08:
92:b6:05:30:29:c2:00:fc:96:6e:b1:ff:9b:00:d7:c3:7b:34:
47:02:81:2a:44:46:85:6c:7a:f5:c3:09:e2:9c:fd:1d:d3:2c:
a4:e9:a5:99:ec:47:bd:fe:39:d2:c9:d6:ac:dd:48:40:0b:9a:
24:f1:0b:4e:02:62:aa:63:e4:dd:8f:ad:9a:6c:5a:0a:de:d0:
a2:67:b2:ea:fa:68:ff:18:ea:e1:73:35:89:45:dd:b7:ac:2d:
58:8a:a3:6d:eb:41:f6:fa:60:8f:39:38:33:a0:d5:fd:56:5d:
02:08:80:40:f6:f0:c1:68:e1:15:c8:fc:c3:64:a5:43:85:18:
ed:44:5d:f8:b9:20:43:9f:3d:8b:20:e0:55:cd:78:89:d4:db:
80:23:88:0e:6f:f5:ef:66:52:a9:c6:b1:f1:5e:6c:d6:8e:18:
7a:93:14:65:4b:1b:a7:55:7d:9d:a5:d2:15:a8:7d:a1:aa:dd:
ef:93:94:d5:3e:2f:ce:4b:bf:ac:e5:61:da:66:61:bd:42:08:
53:58:73:a7:80:64:78:17:60:11:71:7f:75:17:bc:24:2f:57:
8c:61:37:87:4e:0a:41:82:74:b0:69:14:5c:89:58:55:32:1f:
06:1b:e2:24
-----BEGIN CERTIFICATE-----
MIIFjTCCA3WgAwIBAgIRANOxciY0IzLc9AUoUSrsnGowDQYJKoZIhvcNAQELBQAw
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTYxMDA2MTU0MzU1
WhcNMjExMDA2MTU0MzU1WjBKMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
RW5jcnlwdDEjMCEGA1UEAxMaTGV0J3MgRW5jcnlwdCBBdXRob3JpdHkgWDMwggEi
MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc0wzwWuUuR7dyXTeDs2hjMOrX
NSYZJeG9vjXxcJIvt7hLQQWrqZ41CFjssSrEaIcLo+N15Obzp2JxunmBYB/XkZqf
89B4Z3HIaQ6Vkc/+5pnpYDxIzH7KTXcSJJ1HG1rrueweNwAcnKx7pwXqzkrrvUHl
Npi5y/1tPJZo3yMqQpAMhnRnyH+lmrhSYRQTP2XpgofL2/oOVvaGifOFP5eGr7Dc
Gu9rDZUWfcQroGWymQQ2dYBrrErzG5BJeC+ilk8qICUpBMZ0wNAxzY8xOJUWuqgz
uEPxsR/DMH+ieTETPS02+OP88jNquTkxxa/EjQ0dZBYzqvqEKbbUC8DYfcOTAgMB
AAGjggFnMIIBYzAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADBU
BgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEBATAwMC4GCCsGAQUFBwIB
FiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQub3JnMB0GA1UdDgQWBBSo
SmpjBH3duubRObemRWXv86jsoTAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3Js
LnJvb3QteDEubGV0c2VuY3J5cHQub3JnMHIGCCsGAQUFBwEBBGYwZDAwBggrBgEF
BQcwAYYkaHR0cDovL29jc3Aucm9vdC14MS5sZXRzZW5jcnlwdC5vcmcvMDAGCCsG
AQUFBzAChiRodHRwOi8vY2VydC5yb290LXgxLmxldHNlbmNyeXB0Lm9yZy8wHwYD
VR0jBBgwFoAUebRZ5nu25eQBc4AIiMgaWPbpm24wDQYJKoZIhvcNAQELBQADggIB
ABnPdSA0LTqmRf/Q1eaM2jLonG4bQdEnqOJQ8nCqxOeTRrToEKtwT++36gTSlBGx
A/5dut82jJQ2jxN8RI8L9QFXrWi4xXnA2EqA10yjHiR6H9cj6MFiOnb5In1eWsRM
UM2v3e9tNsCAgBukPHAg1lQh07rvFKm/Bz9BCjaxorALINUfZ9DD64j2igLIxle2
DPxW8dI/F2loHMjXZjqG8RkqZUdoxtID5+90FgsGIfkMpqgRS05f4zPbCEHqCXl1
eO5HyELTgcVlLXXQDgAWnRzut1hFJeczY1tjQQno6f6s+nMydLN26WuU4s3UYvOu
OsUxRlJu7TSRHqDC3lSE5XggVkzdaPkuKGQbGpny+01/47hfXXNB7HntWNZ6N2Vw
p7G6OfY+YQrZwIaQmhrIqJZuigsrbe3W+gdn5ykE9+Ky0VgVUsfxo52mwFYs1JKY
2PGDuWx8M6DlS6qQkvHaRUo0FMd8TsSlbF0/v965qGFKhSDeQoMpYnwcmQilRh/0
ayLThlHLN81gSkJjVrPI0Y8xCVPB4twb1PFUd2fPM3sA1tJ83sZ5v8vgFv2yofKR
PB0t6JzUA81mSqM3kxl5e+IZwhYAyO0OTg3/fs8HqGTNKd9BqoUwSRBzp06JMg5b
rUCGwbCUDI0mxadJ3Bz4WxR6fyNpBK2yAinWEsikxqEt
-----END CERTIFICATE-----
LetsEncrypt Root CA
Certificate:
Data:
Version: 3 (0x2)
Serial Number:
03:74:f1:c1:0b:b8:be:e9:c5:30:d3:e4:43:db:f8:ff:05:0d
Signature Algorithm: sha256WithRSAEncryption
Issuer: C = US, O = Let's Encrypt, CN = Let's Encrypt Authority X3
Validity
Not Before: Mar 10 21:26:03 2019 GMT
Not After : Jun 8 21:26:03 2019 GMT
Subject: CN = login.virtual-nexus.xyz
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
RSA Public-Key: (4096 bit)
Modulus:
00:aa:ea:b2:94:3e:9e:bf:08:c7:9a:3b:93:9d:4a:
a4:8e:18:f1:60:a1:26:d1:78:c1:72:11:8e:da:3e:
fa:16:3a:f4:a4:b2:de:ee:ec:eb:86:f1:88:2e:78:
1a:04:90:44:e4:c2:72:c3:85:cf:8e:3b:9a:cd:f6:
2c:4e:cb:39:06:18:2a:b9:70:dd:a5:d0:d6:71:01:
e8:e6:cc:f4:86:dd:88:2b:d5:de:28:a4:6c:a2:c9:
ab:dd:8b:0f:12:2a:1d:67:0f:fe:02:f9:33:1e:0c:
84:be:16:d2:f2:b0:4d:b3:54:3d:db:df:83:8d:9a:
1e:16:46:0b:f5:42:fb:91:4b:6a:95:7e:6b:48:e3:
86:d8:60:5d:4d:9a:4e:a6:82:e7:05:02:83:78:72:
b4:62:8b:27:30:3a:20:8f:72:95:58:56:45:43:db:
4e:e3:4a:87:0a:c9:58:f9:ec:63:65:d4:eb:f7:1d:
cc:2b:5c:8d:7d:61:54:0f:83:78:9a:b3:bf:db:87:
45:b9:99:9b:54:75:e8:1c:52:29:f8:37:ad:24:5a:
ca:2b:1a:b2:11:8e:d4:34:bb:00:a8:e2:ae:ed:34:
14:30:13:e1:06:c5:ee:d4:b2:9b:94:8d:f5:dc:2b:
a0:d3:ab:35:32:8b:e5:cf:d5:44:68:69:5d:3f:22:
86:c9:2d:14:b6:b1:82:0c:fe:87:4d:a0:0a:76:1d:
c3:be:b9:ff:6e:c4:9e:f7:2d:d2:f5:ad:4d:aa:7f:
4e:44:d6:7b:b4:6a:d0:71:52:48:2c:30:bf:11:b5:
df:70:40:30:cc:1a:e4:c0:a0:90:86:56:bf:36:92:
2a:00:a5:0d:3b:2d:42:29:c1:4c:d6:9f:47:83:ff:
c1:c4:cc:04:08:9f:8b:2c:ca:4c:f5:d4:a5:38:81:
6a:d0:4d:68:d9:fb:fa:1e:de:a1:c2:47:ea:d4:a8:
a3:b2:ba:47:50:b4:0e:15:a7:a7:ac:e2:a4:21:7c:
20:c3:6b:ef:4f:3d:57:d0:91:ce:19:b2:da:4d:cd:
7f:2d:2e:12:9d:e8:55:fc:02:ad:ea:57:68:d6:f9:
96:9f:85:98:56:10:a2:bb:b6:7b:24:34:ab:9d:d7:
c9:56:47:40:b5:b1:22:80:b1:ae:37:73:6c:94:93:
6c:db:97:47:b1:86:3c:87:5d:ad:52:2a:44:16:ce:
0c:5c:94:1d:c2:cd:17:76:89:9a:ec:80:78:b9:a9:
c7:90:d2:c6:de:22:bb:95:1e:f6:ad:04:a0:46:c9:
4b:12:2e:8d:ff:89:6c:c8:69:91:78:a0:f3:cf:f2:
22:7d:68:4e:ee:32:0f:61:17:09:ba:94:bd:88:6d:
a8:65:cd
Exponent: 65537 (0x10001)
X509v3 extensions:
X509v3 Key Usage: critical
Digital Signature, Key Encipherment
X509v3 Extended Key Usage:
TLS Web Server Authentication, TLS Web Client Authentication
X509v3 Basic Constraints: critical
CA:FALSE
X509v3 Subject Key Identifier:
2D:36:69:83:B8:E4:7D:38:D1:8F:8B:92:9E:A8:FD:6B:E9:25:29:97
X509v3 Authority Key Identifier:
keyid:A8:4A:6A:63:04:7D:DD:BA:E6:D1:39:B7:A6:45:65:EF:F3:A8:EC:A1
Authority Information Access:
OCSP - URI:http://ocsp.int-x3.letsencrypt.org
CA Issuers - URI:http://cert.int-x3.letsencrypt.org/
X509v3 Subject Alternative Name:
DNS:login.virtual-nexus.xyz
X509v3 Certificate Policies:
Policy: 2.23.140.1.2.1
Policy: 1.3.6.1.4.1.44947.1.1.1
CPS: http://cps.letsencrypt.org
CT Precertificate SCTs:
Signed Certificate Timestamp:
Version : v1 (0x0)
Log ID : 74:7E:DA:83:31:AD:33:10:91:21:9C:CE:25:4F:42:70:
C2:BF:FD:5E:42:20:08:C6:37:35:79:E6:10:7B:CC:56
Timestamp : Mar 10 22:26:03.415 2019 GMT
Extensions: none
Signature : ecdsa-with-SHA256
30:45:02:21:00:98:49:3F:B0:C4:66:2D:CF:CE:91:36:
15:AF:75:94:5B:FD:C2:CB:8F:F1:E2:8D:FA:C0:61:8E:
E6:F3:7B:A8:05:02:20:62:39:0F:66:B2:79:48:A8:49:
41:2A:D4:59:86:C3:FA:AC:C1:5D:26:02:AC:E3:D8:C8:
0F:40:34:64:F1:D1:36
Signed Certificate Timestamp:
Version : v1 (0x0)
Log ID : 29:3C:51:96:54:C8:39:65:BA:AA:50:FC:58:07:D4:B7:
6F:BF:58:7A:29:72:DC:A4:C3:0C:F4:E5:45:47:F4:78
Timestamp : Mar 10 22:26:03.442 2019 GMT
Extensions: none
Signature : ecdsa-with-SHA256
30:46:02:21:00:C7:09:49:5A:96:E5:B5:15:2A:F1:EA:
03:A4:7D:10:89:23:9A:C2:C9:9F:35:85:AD:87:11:58:
A8:95:5C:0A:C6:02:21:00:88:14:C8:48:C7:6B:96:DB:
A2:AB:91:BD:F7:3D:AD:FA:37:F6:AD:BF:D7:24:DC:F0:
11:CF:0C:D4:42:E0:72:A5
Signature Algorithm: sha256WithRSAEncryption
42:55:9f:ea:ae:79:1d:9d:e9:06:23:a1:d0:a9:0f:d2:bc:08:
92:b6:05:30:29:c2:00:fc:96:6e:b1:ff:9b:00:d7:c3:7b:34:
47:02:81:2a:44:46:85:6c:7a:f5:c3:09:e2:9c:fd:1d:d3:2c:
a4:e9:a5:99:ec:47:bd:fe:39:d2:c9:d6:ac:dd:48:40:0b:9a:
24:f1:0b:4e:02:62:aa:63:e4:dd:8f:ad:9a:6c:5a:0a:de:d0:
a2:67:b2:ea:fa:68:ff:18:ea:e1:73:35:89:45:dd:b7:ac:2d:
58:8a:a3:6d:eb:41:f6:fa:60:8f:39:38:33:a0:d5:fd:56:5d:
02:08:80:40:f6:f0:c1:68:e1:15:c8:fc:c3:64:a5:43:85:18:
ed:44:5d:f8:b9:20:43:9f:3d:8b:20:e0:55:cd:78:89:d4:db:
80:23:88:0e:6f:f5:ef:66:52:a9:c6:b1:f1:5e:6c:d6:8e:18:
7a:93:14:65:4b:1b:a7:55:7d:9d:a5:d2:15:a8:7d:a1:aa:dd:
ef:93:94:d5:3e:2f:ce:4b:bf:ac:e5:61:da:66:61:bd:42:08:
53:58:73:a7:80:64:78:17:60:11:71:7f:75:17:bc:24:2f:57:
8c:61:37:87:4e:0a:41:82:74:b0:69:14:5c:89:58:55:32:1f:
06:1b:e2:24
-----BEGIN CERTIFICATE-----
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
-----END CERTIFICATE-----
GlobalSign Root CA
@@ -2943,106 +3238,6 @@ JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
-----END CERTIFICATE-----
DST ACES CA X6
# Issuer: CN=DST ACES CA X6,OU=DST ACES,O=Digital Signature Trust,C=US
# Serial Number:0d:5e:99:0a:d6:9d:b7:78:ec:d8:07:56:3b:86:15:d9
# Subject: CN=DST ACES CA X6,OU=DST ACES,O=Digital Signature Trust,C=US
# Not Valid Before: Thu Nov 20 21:19:58 2003
# Not Valid After : Mon Nov 20 21:19:58 2017
# Fingerprint (MD5): 21:D8:4C:82:2B:99:09:33:A2:EB:14:24:8D:8E:5F:E8
# Fingerprint (SHA1): 40:54:DA:6F:1C:3F:40:74:AC:ED:0F:EC:CD:DB:79:D1:53:FB:90:1D
TRUSTED_DELEGATOR: SERVER_AUTH
MUST_VERIFY_TRUST: EMAIL_PROTECTION, CODE_SIGNING
=================================================
MD5 Fingerprint=21:D8:4C:82:2B:99:09:33:A2:EB:14:24:8D:8E:5F:E8
Certificate:
Data:
Version: 3 (0x2)
Serial Number:
0d:5e:99:0a:d6:9d:b7:78:ec:d8:07:56:3b:86:15:d9
Signature Algorithm: sha1WithRSAEncryption
Issuer: C=US, O=Digital Signature Trust, OU=DST ACES, CN=DST ACES CA X6
Validity
Not Before: Nov 20 21:19:58 2003 GMT
Not After : Nov 20 21:19:58 2017 GMT
Subject: C=US, O=Digital Signature Trust, OU=DST ACES, CN=DST ACES CA X6
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
Public-Key: (2048 bit)
Modulus:
00:b9:3d:f5:2c:c9:94:dc:75:8a:95:5d:63:e8:84:
77:76:66:b9:59:91:5c:46:dd:92:3e:9f:f9:0e:03:
b4:3d:61:92:bd:23:26:b5:63:ee:92:d2:9e:d6:3c:
c8:0d:90:5f:64:81:b1:a8:08:0d:4c:d8:f9:d3:05:
28:52:b4:01:25:c5:95:1c:0c:7e:3e:10:84:75:cf:
c1:19:91:63:cf:e8:a8:91:88:b9:43:52:bb:80:b1:
55:89:8b:31:fa:d0:b7:76:be:41:3d:30:9a:a4:22:
25:17:73:e8:1e:e2:d3:ac:2a:bd:5b:38:21:d5:2a:
4b:d7:55:7d:e3:3a:55:bd:d7:6d:6b:02:57:6b:e6:
47:7c:08:c8:82:ba:de:a7:87:3d:a1:6d:b8:30:56:
c2:b3:02:81:5f:2d:f5:e2:9a:30:18:28:b8:66:d3:
cb:01:96:6f:ea:8a:45:55:d6:e0:9d:ff:67:2b:17:
02:a6:4e:1a:6a:11:0b:7e:b7:7b:e7:98:d6:8c:76:
6f:c1:3b:db:50:93:7e:e5:d0:8e:1f:37:b8:bd:ba:
c6:9f:6c:e9:7c:33:f2:32:3c:26:47:fa:27:24:02:
c9:7e:1d:5b:88:42:13:6a:35:7c:7d:35:e9:2e:66:
91:72:93:d5:32:26:c4:74:f5:53:a3:b3:5d:9a:f6:
09:cb
Exponent: 65537 (0x10001)
X509v3 extensions:
X509v3 Basic Constraints: critical
CA:TRUE
X509v3 Key Usage: critical
Digital Signature, Non Repudiation, Certificate Sign, CRL Sign
X509v3 Subject Alternative Name:
email:pki-ops@trustdst.com
X509v3 Certificate Policies:
Policy: 2.16.840.1.101.3.2.1.1.1
CPS: http://www.trustdst.com/certificates/policy/ACES-index.html
X509v3 Subject Key Identifier:
09:72:06:4E:18:43:0F:E5:D6:CC:C3:6A:8B:31:7B:78:8F:A8:83:B8
Signature Algorithm: sha1WithRSAEncryption
a3:d8:8e:d6:b2:db:ce:05:e7:32:cd:01:d3:04:03:e5:76:e4:
56:2b:9c:99:90:e8:08:30:6c:df:7d:3d:ee:e5:bf:b5:24:40:
84:49:e1:d1:28:ae:c4:c2:3a:53:30:88:f1:f5:77:6e:51:ca:
fa:ff:99:af:24:5f:1b:a0:fd:f2:ac:84:ca:df:a9:f0:5f:04:
2e:ad:16:bf:21:97:10:81:3d:e3:ff:87:8d:32:dc:94:e5:47:
8a:5e:6a:13:c9:94:95:3d:d2:ee:c8:34:95:d0:80:d4:ad:32:
08:80:54:3c:e0:bd:52:53:d7:52:7c:b2:69:3f:7f:7a:cf:6a:
74:ca:fa:04:2a:9c:4c:5a:06:a5:e9:20:ad:45:66:0f:69:f1:
dd:bf:e9:e3:32:8b:fa:e0:c1:86:4d:72:3c:2e:d8:93:78:0a:
2a:f8:d8:d2:27:3d:19:89:5f:5a:7b:8a:3b:cc:0c:da:51:ae:
c7:0b:f7:2b:b0:37:05:ec:bc:57:23:e2:38:d2:9b:68:f3:56:
12:88:4f:42:7c:b8:31:c4:b5:db:e4:c8:21:34:e9:48:11:35:
ee:fa:c7:92:57:c5:9f:34:e4:c7:f6:f7:0e:0b:4c:9c:68:78:
7b:71:31:c7:eb:1e:e0:67:41:f3:b7:a0:a7:cd:e5:7a:33:36:
6a:fa:9a:2b
-----BEGIN CERTIFICATE-----
MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
-----END CERTIFICATE-----
SwissSign Gold CA - G2
# Issuer: CN=SwissSign Gold CA - G2,O=SwissSign AG,C=CH
# Serial Number:00:bb:40:1c:43:f5:5e:4f:b0

10
indra/newview/llfolderviewitem.cpp
View File

@@ -888,7 +888,6 @@ BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
void LLFolderViewItem::draw()
{
if (!getFiltered()) return;
static LLCachedControl<LLColor4> sFgColor(gColors, "MenuItemEnabledColor", LLColor4::white );
static LLCachedControl<LLColor4> sHighlightBgColor(gColors, "MenuItemHighlightBgColor", LLColor4::white );
static LLCachedControl<LLColor4> sHighlightFgColor(gColors, "MenuItemHighlightFgColor", LLColor4::white );
@@ -901,8 +900,12 @@ void LLFolderViewItem::draw()
const S32 FOCUS_LEFT = 1;
const LLFontGL* font = getLabelFontForStyle(mLabelStyle);
const BOOL in_inventory = getListener() && gInventory.isObjectDescendentOf(getListener()->getUUID(), gInventory.getRootFolderID());
const BOOL in_library = getListener() && gInventory.isObjectDescendentOf(getListener()->getUUID(), gInventory.getLibraryRootFolderID());
const LLUUID* id = getListener() ? &getListener()->getUUID() : nullptr;
const BOOL in_inventory = id && gInventory.isObjectDescendentOf(*id, gInventory.getRootFolderID());
const BOOL in_library = id && !in_inventory && gInventory.isObjectDescendentOf(*id, gInventory.getLibraryRootFolderID());
// Don't draw filtered top level marketplace folders
if (in_inventory && !getFiltered() && depth_nesting_in_marketplace(*id) == 1) return;
//--------------------------------------------------------------------------------//
// Draw open folder arrow
@@ -2572,7 +2575,6 @@ BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
void LLFolderViewFolder::draw()
{
if (!getFiltered()) return;
if (mAutoOpenCountdown != 0.f)
{
mControlLabelRotation = mAutoOpenCountdown * -90.f;

6
indra/newview/llinventoryactions.cpp
View File

@@ -84,7 +84,7 @@ void LLInventoryAction::callback_doToSelected(const LLSD& notification, const LL
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if (option == 0) // YES
{
doToSelected(folder, action);
doToSelected(folder, action, false);
}
}
@@ -93,11 +93,11 @@ void LLInventoryAction::callback_copySelected(const LLSD& notification, const LL
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if (option == 0) // YES, Move no copy item(s)
{
doToSelected(root, "copy_or_move_to_marketplace_listings");
doToSelected(root, "copy_or_move_to_marketplace_listings", false);
}
else if (option == 1) // NO, Don't move no copy item(s) (leave them behind)
{
doToSelected(root, "copy_to_marketplace_listings");
doToSelected(root, "copy_to_marketplace_listings", false);
}
}

2
indra/newview/shupdatechecker.cpp
View File

@@ -130,7 +130,6 @@ private:
void check_for_updates()
{
#if LL_WINDOWS | LL_LINUX | LL_DARWIN
// Hard-code the update url for now.
std::string url = "http://singularity-viewer.github.io/pages/api/get_update_info.json";//gSavedSettings.getString("SHUpdateCheckURL");
if (!url.empty())
@@ -151,5 +150,4 @@ void check_for_updates()
}
LLHTTPClient::get(url, new GetUpdateInfoResponder(type));
}
#endif
}

16
indra/newview/skins/default/xui/en-us/menu_marketplace_view.xml
View File

@@ -8,30 +8,30 @@
name="sort_by_name">
<menu_item_check.on_click
function="Marketplace.ViewSort.Action"
parameter="sort_by_name" />
userdata="sort_by_name" />
<menu_item_check.on_check
function="Marketplace.ViewSort.CheckItem"
parameter="sort_by_name" />
userdata="sort_by_name" />
</menu_item_check>
<menu_item_check
label="Sort by most recent"
name="sort_by_recent">
<menu_item_check.on_click
function="Marketplace.ViewSort.Action"
parameter="sort_by_recent" />
userdata="sort_by_recent" />
<menu_item_check.on_check
function="Marketplace.ViewSort.CheckItem"
parameter="sort_by_recent" />
userdata="sort_by_recent" />
</menu_item_check>
<menu_item_check
label="Sort by stock amount (low to high)"
name="sort_by_stock_amount">
<menu_item_check.on_click
function="Marketplace.ViewSort.Action"
parameter="sort_by_stock_amount"/>
userdata="sort_by_stock_amount"/>
<menu_item_check.on_check
function="Marketplace.ViewSort.CheckItem"
parameter="sort_by_stock_amount"/>
userdata="sort_by_stock_amount"/>
</menu_item_check>
<menu_item_separator
layout="topleft" />
@@ -40,9 +40,9 @@
name="show_only_listing_folders">
<menu_item_check.on_click
function="Marketplace.ViewSort.Action"
parameter="show_only_listing_folders"/>
userdata="show_only_listing_folders"/>
<menu_item_check.on_check
function="Marketplace.ViewSort.CheckItem"
parameter="show_only_listing_folders"/>
userdata="show_only_listing_folders"/>
</menu_item_check>
</menu>

1
indra/newview/skins/default/xui/en-us/panel_marketplace_listings.xml
View File

@@ -22,7 +22,6 @@
width="31"
height="25"
left="2"
visibility_control="LiruEnableWIPUI"
menu_filename="menu_marketplace_view.xml"
image_overlay="Conv_toolbar_sort"
menu_position="bottomleft"/>