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

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/MailHandler.cpp

1 files changed, 13 insertions, 0 deletions

diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
index 596f7f5ceb9..7172efaac0e 100644
--- a/src/server/game/Accounts/AccountMgr.cpp
+++ b/src/server/game/Accounts/AccountMgr.cpp
@@ -544,3 +544,16 @@ RBACPermission const* AccountMgr::GetRBACPermission(uint32 permission) const
 
     return NULL;
 }
+
+bool AccountMgr::HasPermission(uint32 accountId, uint32 permission, uint32 realmId)
+{
+    if (!accountId)
+        return false;
+
+    RBACData* rbac = new RBACData(accountId, "", realmId);
+    rbac->LoadFromDB();
+    bool hasPermission = rbac->HasPermission(permission);
+    delete rbac;
+
+    return hasPermission;
+}