diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-01-13 00:17:48 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-01-13 00:17:48 +0200 |
| commit | 1b90d81fdf68932a298498c9913a9680f79b29d0 (patch) | |
| tree | 813949143d853d000bca9b11727d1e7c674e6188 /indra/newview | |
| parent | 093395b48977d89d0c390952ef487f6cb9243c02 (diff) | |
| parent | 1ec05e93695a661f6b3b6e374bf60cb991bab954 (diff) | |
Merge branch 'master' into DRTVWR-540-maint
Diffstat (limited to 'indra/newview')
| -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> |