aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2017-12-30 23:15:15 +0100
committerjoschiwald <joschiwald.trinity@gmail.com>2017-12-30 23:15:15 +0100
commitdc294731208991bf0b6b4ab2ff7ad02ac13cc862 (patch)
tree9e148c30d296bfb3c912f9ab28a2518f3ace7f0c /src
parent299fad57fc95c60595bd8417f8a41da431f97f83 (diff)
Core/RBAC: Fixed permissions conflict with 3.3.5 branch
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Accounts/RBAC.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index 15995b0923d..f3cd06fab33 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -771,7 +771,11 @@ enum RBACPermissions
RBAC_PERM_COMMAND_GROUP_MAINASSIST = 864, // reserved
RBAC_PERM_COMMAND_NPC_SHOWLOOT = 865, // reserved
RBAC_PERM_COMMAND_LIST_SPAWNPOINTS = 866, // reserved
- RBAC_PERM_COMMAND_MODIFY_POWER = 867,
+ RBAC_PERM_COMMAND_RELOAD_QUEST_GREETING_LOCALE = 867, // reserved
+ RBAC_PERM_COMMAND_MODIFY_POWER = 868,
+ //
+ // IF YOU ADD NEW PERMISSIONS, ADD THEM IN 3.3.5 BRANCH AS WELL!
+ //
// custom permissions 1000+
RBAC_PERM_MAX
};