From 758f62a5531b3a28c10d8e410645a022868976cd Mon Sep 17 00:00:00 2001
From: amzn-sj <srikkant@amazon.com>
Date: Fri, 4 Jun 2021 12:34:50 -0700
Subject: [PATCH 1/5] Fix Editor crash in Mac

---
 Registry/Platform/Mac/streamer.editor.setreg | 28 ++++++++++++++++++++
 Registry/Platform/Mac/streamer.test.setreg   | 24 +++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 Registry/Platform/Mac/streamer.editor.setreg
 create mode 100644 Registry/Platform/Mac/streamer.test.setreg

diff --git a/Registry/Platform/Mac/streamer.editor.setreg b/Registry/Platform/Mac/streamer.editor.setreg
new file mode 100644
index 0000000000..85360d128e
--- /dev/null
+++ b/Registry/Platform/Mac/streamer.editor.setreg
@@ -0,0 +1,28 @@
+{
+    "Amazon":
+    {
+        "AzCore":
+        {
+            "Streamer":
+            {
+                "Profiles":
+                {
+                    "Generic":
+                    {
+                        "Stack":
+                        [
+                            {
+                                "$type": "AZ::IO::StorageDriveConfig",
+                                // The maximum number of file handles that the drive will cache.
+                                // On Mac the default limit for the number of file handles an application
+                                // can have open is set to 256. So we need to set this to a lower value than on PC.
+                                // This limit is set by "launchctl limit maxfiles"
+                                "MaxFileHandles": 65
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Registry/Platform/Mac/streamer.test.setreg b/Registry/Platform/Mac/streamer.test.setreg
new file mode 100644
index 0000000000..df41b7a350
--- /dev/null
+++ b/Registry/Platform/Mac/streamer.test.setreg
@@ -0,0 +1,24 @@
+{
+    "Amazon":
+    {
+        "AzCore":
+        {
+            "Streamer":
+            {
+                "Profiles":
+                {
+                    "Generic":
+                    {
+                        "Stack":
+                        [
+                            {
+                                "$type": "AZ::IO::StorageDriveConfig",
+                                "MaxFileHandles": 65
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

From 16eb3bd82c9fa842b6f654115607e50bf7a5a65e Mon Sep 17 00:00:00 2001
From: lumberyard-employee-dm
 <56135373+lumberyard-employee-dm@users.noreply.github.com>
Date: Fri, 4 Jun 2021 15:25:49 -0500
Subject: [PATCH 2/5] Adding newline to streamer.editor.setreg

---
 Registry/Platform/Mac/streamer.editor.setreg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Registry/Platform/Mac/streamer.editor.setreg b/Registry/Platform/Mac/streamer.editor.setreg
index 85360d128e..2fc8197c5f 100644
--- a/Registry/Platform/Mac/streamer.editor.setreg
+++ b/Registry/Platform/Mac/streamer.editor.setreg
@@ -25,4 +25,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From f7caa988081eca13d0680eb89eed5af5a795224f Mon Sep 17 00:00:00 2001
From: lumberyard-employee-dm
 <56135373+lumberyard-employee-dm@users.noreply.github.com>
Date: Fri, 4 Jun 2021 15:26:16 -0500
Subject: [PATCH 4/5] Adding newline to streamer.test.setreg

---
 Registry/Platform/Mac/streamer.test.setreg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Registry/Platform/Mac/streamer.test.setreg b/Registry/Platform/Mac/streamer.test.setreg
index df41b7a350..2b053a497e 100644
--- a/Registry/Platform/Mac/streamer.test.setreg
+++ b/Registry/Platform/Mac/streamer.test.setreg
@@ -21,4 +21,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From 6ee58b7b641ea9b7bd8727217920e0f9477bc664 Mon Sep 17 00:00:00 2001
From: amzn-sj <srikkant@amazon.com>
Date: Fri, 4 Jun 2021 16:09:37 -0700
Subject: [PATCH 5/5] Fix overrides for array in editor setreg. Remove the test
 overrides.

---
 Registry/Platform/Mac/streamer.editor.setreg |  5 ++++
 Registry/Platform/Mac/streamer.test.setreg   | 24 --------------------
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 Registry/Platform/Mac/streamer.test.setreg

diff --git a/Registry/Platform/Mac/streamer.editor.setreg b/Registry/Platform/Mac/streamer.editor.setreg
index 85360d128e..dafcfdc9d9 100644
--- a/Registry/Platform/Mac/streamer.editor.setreg
+++ b/Registry/Platform/Mac/streamer.editor.setreg
@@ -18,6 +18,11 @@
                                 // can have open is set to 256. So we need to set this to a lower value than on PC.
                                 // This limit is set by "launchctl limit maxfiles"
                                 "MaxFileHandles": 65
+                            },
+                            {
+                                "$type": "AzFramework::RemoteStorageDriveConfig",
+                                // The maximum number of file handles that the drive will cache.
+                                "MaxFileHandles": 1024
                             }
                         ]
                     }
diff --git a/Registry/Platform/Mac/streamer.test.setreg b/Registry/Platform/Mac/streamer.test.setreg
deleted file mode 100644
index df41b7a350..0000000000
--- a/Registry/Platform/Mac/streamer.test.setreg
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "Amazon":
-    {
-        "AzCore":
-        {
-            "Streamer":
-            {
-                "Profiles":
-                {
-                    "Generic":
-                    {
-                        "Stack":
-                        [
-                            {
-                                "$type": "AZ::IO::StorageDriveConfig",
-                                "MaxFileHandles": 65
-                            }
-                        ]
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file