Merge main into property-entrance-rewrite

dMasterServer/ObjectIDManager.h

@@ -3,7 +3,7 @@
 // C++
 #include <cstdint>
 
-class dLogger;
+class Logger;
 
 /*!
   \file ObjectIDManager.hpp
@@ -13,7 +13,7 @@ class dLogger;
  //! The Object ID Manager
 class ObjectIDManager {
 private:
-	dLogger* mLogger;
+	Logger* mLogger;
 	static ObjectIDManager* m_Address;         //!< The singleton instance
 
 	uint32_t currentPersistentID;               //!< The highest current persistent ID in use
@@ -35,7 +35,7 @@ public:
 	}
 
 	//! Initializes the manager
-	void Initialize(dLogger* logger);
+	void Initialize(Logger* logger);
 
 	//! Generates a new persistent ID
 	/*!