diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2022-01-12 16:25:11 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2022-01-12 16:25:11 -0700 |
| commit | b10d4459189947d45989db33a681510b3cd623dc (patch) | |
| tree | 229e6deff6f40eb161a8a3d418c694c22bb5742d | |
| parent | 936fd8ce491ee7110a8bf611eabf200182dcb943 (diff) | |
| parent | 1ec05e93695a661f6b3b6e374bf60cb991bab954 (diff) | |
Merge branch 'master' v6.5.3 into DRTVWR-546 (leaving VIEWER_VERSION @ 6.6.0)
| -rwxr-xr-x | indra/newview/installers/darwin/apple-notarize.sh | 3 | ||||
| -rw-r--r-- | indra/newview/slplugin.entitlements | 2 |
2 files changed, 4 insertions, 1 deletions
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> |