Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/shared/Packets/ByteBuffer.h

3 files changed, 8 insertions, 10 deletions

diff --git a/src/server/shared/Logging/Appender.cpp b/src/server/shared/Logging/Appender.cpp
index efb141d1060..cde94fe3a7c 100644
--- a/src/server/shared/Logging/Appender.cpp
+++ b/src/server/shared/Logging/Appender.cpp
@@ -218,6 +218,8 @@ char const* Appender::getLogFilterTypeString(LogFilterType type)
             return "SOAP";
         case LOG_FILTER_RBAC:
             return "RBAC";
+        case LOG_FILTER_CHEAT:
+            return "CHEAT";
         default:
             break;
     }
diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h
index e11bc40c42f..983f6a5ddbe 100644
--- a/src/server/shared/Logging/Appender.h
+++ b/src/server/shared/Logging/Appender.h
@@ -68,10 +68,11 @@ enum LogFilterType
     LOG_FILTER_SERVER_LOADING                    = 40,
     LOG_FILTER_OPCODES                           = 41,
     LOG_FILTER_SOAP                              = 42,
-    LOG_FILTER_RBAC                              = 43
+    LOG_FILTER_RBAC                              = 43,
+    LOG_FILTER_CHEAT                             = 44
 };
 
-const uint8 MaxLogFilter = 43;
+const uint8 MaxLogFilter = 45;
 
 // Values assigned have their equivalent in enum ACE_Log_Priority
 enum LogLevel
@@ -108,12 +109,8 @@ enum AppenderFlags
 struct LogMessage
 {
     LogMessage(LogLevel _level, LogFilterType _type, std::string _text)
-        : level(_level)
-        , type(_type)
-        , text(_text)
-    {
-        mtime = time(NULL);
-    }
+        : level(_level), type(_type), text(_text), mtime(time(NULL))
+    { }
 
     static std::string getTimeStr(time_t time);
     std::string getTimeStr();
diff --git a/src/server/shared/Logging/LogOperation.h b/src/server/shared/Logging/LogOperation.h
index 0a0dde3bb61..40017cb87f4 100644
--- a/src/server/shared/Logging/LogOperation.h
+++ b/src/server/shared/Logging/LogOperation.h
@@ -25,8 +25,7 @@ class LogOperation
 {
     public:
         LogOperation(Logger* _logger, LogMessage* _msg)
-            : logger(_logger)
-            , msg(_msg)
+            : logger(_logger), msg(_msg)
         { }
 
         ~LogOperation();