Merge branch 'fix/spawn-disabled-in-scene-placed-and-network-prefab-registration' of https://github.com/Unity-Technologies/com.unity.netcode.gameobjects into fix/spawn-disabled-in-scene-placed-and-network-prefab-registration

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

@@ -1911,14 +1911,14 @@ private void SpawnInternal(bool destroyWithScene, ulong ownerClientId, bool play
 #pragma warning restore CS0618 // Type or member is obsolete
 
             // If the initial state of the GameObject was disabled and InScenePlaced is marked,
-            // then spawn it as in-scene placed.[MTT-15388]
+            // then spawn it as in-scene placed.
             // Otherwise:
             // If we are marked as in-scene place, have never been spawned, and the root GameObject
             // was not disabled upon being instantiated, then treat this as a dynamically spawned
             // instance.
             if (InScenePlaced && !m_InScenePlacedDisabledByDefault && !HasBeenSpawned)
             {
-                if (NetworkManagerOwner.NetworkConfig.EnableSceneManagement && NetworkManagerOwner.LogLevel <= LogLevel.Developer)
+                if (NetworkManagerOwner.NetworkConfig.EnableSceneManagement && NetworkManagerOwner.LogLevel <= LogLevel.Normal)
                 {
                     Debug.LogWarning($"[{name}][SceneOrigin={SceneOriginHandle}] Dynamically spawning InScenePlaced network object. This can cause issues!", this);
                 }

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs

@@ -1617,9 +1617,9 @@ internal void ServerSpawnSceneObjectsOnStartSweep()
                     // If this isn't the original prefab asset being skipped over (integration test would be a good example), then log the error.
                     if (!NetworkManager.NetworkConfig.Prefabs.IsActualPrefabAsset(networkObject))
                     {
-                        NetworkManager.Log.Error(new Context(LogLevel.Error, $"{networkObject.name} appears to be a pre-instantiated {nameof(GameObject)} " +
-                            $"with a {nameof(NetworkObject)} component instance that is not a registered prefab nor is it an in-scene placed {nameof(NetworkObject)}." +
-                            $" Dynamically creating unregistered {nameof(NetworkObject)}s is not supported! {networkObject.name} will not be spawned."));
+                        NetworkManager.Log.Error(new Context(LogLevel.Error, $"Detected a pre-instantiated {nameof(GameObject)} " +
+                            $"with a {nameof(NetworkObject)} component instance that is not a registered prefab nor an in-scene placed {nameof(NetworkObject)}." +
+                            $" Dynamically creating unregistered {nameof(NetworkObject)}s is not supported! This {nameof(NetworkObject)} will not be spawned.").AddNetworkObject(networkObject));
                     }
                     continue;
                 }