Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw

Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/PathGenerator.cpp

1 files changed, 2 insertions, 5 deletions

diff --git a/src/server/shared/Logging/Logger.h b/src/server/shared/Logging/Logger.h
index 46436a8022e..24727ce1016 100644
--- a/src/server/shared/Logging/Logger.h
+++ b/src/server/shared/Logging/Logger.h
@@ -24,21 +24,18 @@ class Logger
 {
     public:
         Logger();
-        ~Logger();
 
-        void Create(std::string const& name, LogFilterType type, LogLevel level);
+        void Create(std::string const& name, LogLevel level);
         void addAppender(uint8 type, Appender *);
         void delAppender(uint8 type);
 
         std::string const& getName() const;
-        LogFilterType getType() const;
         LogLevel getLogLevel() const;
         void setLogLevel(LogLevel level);
-        void write(LogMessage& message);
+        void write(LogMessage& message) const;
 
     private:
         std::string name;
-        LogFilterType type;
         LogLevel level;
         AppenderMap appenders;
 };