Merging last dev

Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-19 23:12:59 -08:00
parent e1ace4a8f6 7100d48e16
commit 6005a4e08b
2657 changed files with 249197 additions and 30535 deletions
@@ -35,7 +35,7 @@ namespace Multiplayer
    {
        m_networkEditorInterface = AZ::Interface<INetworking>::Get()->CreateNetworkInterface(
            AZ::Name(MpEditorInterfaceName), ProtocolType::Tcp, TrustZone::ExternalClientToServer, *this);
-        m_networkEditorInterface->SetTimeoutMs(AZ::TimeMs{ 0 }); // Disable timeouts on this network interface
+        m_networkEditorInterface->SetTimeoutMs(AZ::Time::ZeroTimeMs); // Disable timeouts on this network interface

        // Wait to activate the editor-server until LegacySystemInterfaceCreated so that the logging system is ready
        // Automated testing listens for these logs