Fix log playback GUI display (#2611)

Loading the logging playback plugin before `SceneBroadcaster`
prevents playback from being displayed on the GUI.

---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Arjo Chakravarty <[email protected]>
(cherry picked from commit ca40c1d)

# Conflicts:
#	src/SimulationRunner.cc

Author: azeey

src/SimulationRunner.cc

@@ -1587,8 +1587,6 @@ void SimulationRunner::CreateEntities(const sdf::World &_world)
   this->entityCompMgr.ProcessRemoveEntityRequests();
   this->entityCompMgr.ClearRemovedComponents();
 
-  this->LoadLoggingPlugins(this->serverConfig);
-
   // Load any additional plugins from the Server Configuration
   this->LoadServerPlugins(this->serverConfig.Plugins());
 
@@ -1598,9 +1596,49 @@ void SimulationRunner::CreateEntities(const sdf::World &_world)
   {
     gzmsg << "No systems loaded from SDF, loading defaults" << std::endl;
     bool isPlayback = !this->serverConfig.LogPlaybackPath().empty();
+<<<<<<< HEAD
     auto plugins = gz::sim::loadPluginInfo(isPlayback);
     this->LoadServerPlugins(plugins);
   }
+=======
+    auto defaultPlugins = gz::sim::loadPluginInfo(isPlayback);
+    if (loadedWorldPlugins.empty())
+    {
+      gzmsg << "No systems loaded from SDF, loading defaults" << std::endl;
+    }
+    else
+    {
+      std::unordered_set<std::string> loadedWorldPluginFileNames;
+      for (const auto &pl : loadedWorldPlugins)
+      {
+        loadedWorldPluginFileNames.insert(pl.fname);
+      }
+      auto isPluginLoaded =
+          [&loadedWorldPluginFileNames](const ServerConfig::PluginInfo &_pl)
+      {
+          return loadedWorldPluginFileNames.count(_pl.Plugin().Filename()) != 0;
+      };
+
+      // Remove plugin if it's already loaded so as to not duplicate world
+      // plugins.
+      defaultPlugins.remove_if(isPluginLoaded);
+
+      gzdbg << "Additional plugins to load:\n";
+      for (const auto &plugin : defaultPlugins)
+      {
+        gzdbg << plugin.Plugin().Name() << " " << plugin.Plugin().Filename()
+              << "\n";
+      }
+    }
+
+    this->LoadServerPlugins(defaultPlugins);
+    // Load logging plugins after all server plugins so that necessary
+    // plugins such as SceneBroadcaster are loaded first. This might be
+    // a bug or an assumption made in the logging plugins.
+    this->LoadLoggingPlugins(this->serverConfig);
+
+  };
+>>>>>>> ca40c1db (Fix log playback GUI display (#2611))
 
   // Store the initial state of the ECM;
   this->initialEntityCompMgr.CopyFrom(this->entityCompMgr);