summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2022-01-21 20:20:45 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-01-21 20:20:45 +0200
commit31a074c3c41cd96f9656ec7510c6eff7ebec440e (patch)
tree4eeaa11b0d30b9b7355723212285641dcc12388b
parent693d9dc3bd608a5777dc8f6ac5f73b3ab796d392 (diff)
parent1ec05e93695a661f6b3b6e374bf60cb991bab954 (diff)
Merge branch 'master' into DRTVWR-486
-rw-r--r--indra/newview/VIEWER_VERSION.txt2
-rwxr-xr-xindra/newview/installers/darwin/apple-notarize.sh3
-rw-r--r--indra/newview/slplugin.entitlements2
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>