summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2022-01-13 00:18:53 +0000
committerEuclid Linden <euclid@lindenlab.com>2022-01-13 00:18:53 +0000
commitac233a46d80f31ceb160654b8186d4cf6a493511 (patch)
tree229e6deff6f40eb161a8a3d418c694c22bb5742d /indra/newview
parent936fd8ce491ee7110a8bf611eabf200182dcb943 (diff)
parentb10d4459189947d45989db33a681510b3cd623dc (diff)
Merged in DV546-merge-6.5.3 (pull request #830)
DRTVWR-546 merge up to 6.5.3
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/installers/darwin/apple-notarize.sh3
-rw-r--r--indra/newview/slplugin.entitlements2
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>