summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2022-01-14 16:04:10 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2022-01-14 16:04:31 +0200
commite7caafba5c4eec21f02a642e37865bc04cd6536e (patch)
tree0aaaf55aa0244e6bfe7ee02e6c58d394ca9627b1 /indra/newview
parent2c3fb3d59b32d03c52415158719d4835af91a5f5 (diff)
parent1ec05e93695a661f6b3b6e374bf60cb991bab954 (diff)
Merge branch 'master' into DRTVWR-539
Diffstat (limited to 'indra/newview')
-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>