diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-01-13 00:15:21 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-01-13 00:15:21 +0000 |
| commit | bdc611badb4450acbcda019b1d11ff92e690f8af (patch) | |
| tree | 1cc39ccb72cc15a367a6f081ceac093b0313dcb3 /indra | |
| parent | 1304549cdc8b3450cb0f445de46d9e7376c33f30 (diff) | |
| parent | 7d2761cc7ed8cccd5ea5b1fae7c34b94f9f7cd9e (diff) | |
Merged in DV528-merge-6.5.3 (pull request #828)
DRTVWR-528 merge up to 6.5.3
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/installers/darwin/apple-notarize.sh | 3 | ||||
| -rw-r--r-- | indra/newview/slplugin.entitlements | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 5e3ec53ea6..db0785f273 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.5.2 +6.5.3 diff --git a/indra/newview/installers/darwin/apple-notarize.sh b/indra/newview/installers/darwin/apple-notarize.sh index 466898ecda..e019437924 100755 --- a/indra/newview/installers/darwin/apple-notarize.sh +++ b/indra/newview/installers/darwin/apple-notarize.sh @@ -16,8 +16,9 @@ if [ -f "$CONFIG_FILE" ]; then --password $PASSWORD \ --asc-provider $ASC_PROVIDER \ --file "$zip_file" 2>&1) + echo $res + requestUUID=$(echo $res | awk '/RequestUUID/ { print $NF; }') - echo "Apple Notarization RequestUUID: $requestUUID" if [[ -n $requestUUID ]]; then diff --git a/indra/newview/slplugin.entitlements b/indra/newview/slplugin.entitlements index a72c6bc82c..aea8dbfd15 100644 --- a/indra/newview/slplugin.entitlements +++ b/indra/newview/slplugin.entitlements @@ -12,5 +12,7 @@ <true/> <key>com.apple.security.cs.allow-dyld-environment-variables</key> <true/> + <key>com.apple.security.device.audio-input</key> + <true/> </dict> </plist> |