Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_reload.cpp

2 files changed, 4 insertions, 1 deletions

diff --git a/src/server/shared/Logging/Appender.cpp b/src/server/shared/Logging/Appender.cpp
index 1d215e1212e..efb141d1060 100644
--- a/src/server/shared/Logging/Appender.cpp
+++ b/src/server/shared/Logging/Appender.cpp
@@ -216,6 +216,8 @@ char const* Appender::getLogFilterTypeString(LogFilterType type)
             return "OPCODE";
         case LOG_FILTER_SOAP:
             return "SOAP";
+        case LOG_FILTER_RBAC:
+            return "RBAC";
         default:
             break;
     }
diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h
index 08628948b90..e11bc40c42f 100644
--- a/src/server/shared/Logging/Appender.h
+++ b/src/server/shared/Logging/Appender.h
@@ -67,7 +67,8 @@ enum LogFilterType
     LOG_FILTER_BATTLEFIELD                       = 39,
     LOG_FILTER_SERVER_LOADING                    = 40,
     LOG_FILTER_OPCODES                           = 41,
-    LOG_FILTER_SOAP                              = 42
+    LOG_FILTER_SOAP                              = 42,
+    LOG_FILTER_RBAC                              = 43
 };
 
 const uint8 MaxLogFilter = 43;