diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-10-19 00:18:06 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-10-19 00:18:06 +0100 |
| commit | 5bf55eacfdf7cfd0036bf51e78a2f04f9b55feb0 (patch) | |
| tree | 9653ff7011d0b370c1360e09590c09ebec4f7e9a /src/server/game/Accounts | |
| parent | e07d3ebe4e6d2d797cb77ba65fb52efbef3462d9 (diff) | |
| parent | 15a9c6729ee274044b2ba78f8b9ad3c167c94bd1 (diff) | |
Merge remote-tracking branch 'origin/3.3.5' into 4.3.4
Conflicts:
sql/base/auth_database.sql
src/server/game/Instances/InstanceScript.h
src/server/scripts/Northrend/isle_of_conquest.cpp
src/server/shared/Database/Implementation/LoginDatabase.cpp
src/server/shared/Database/Implementation/LoginDatabase.h
Diffstat (limited to 'src/server/game/Accounts')
| -rw-r--r-- | src/server/game/Accounts/RBAC.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h index fc22f76e949..ded2a58d7f1 100644 --- a/src/server/game/Accounts/RBAC.h +++ b/src/server/game/Accounts/RBAC.h @@ -535,7 +535,7 @@ enum RBACPermissions RBAC_PERM_COMMAND_RELOAD_CONDITIONS = 629, RBAC_PERM_COMMAND_RELOAD_CONFIG = 630, RBAC_PERM_COMMAND_RELOAD_BATTLEGROUND_TEMPLATE = 631, - RBAC_PERM_UNUSED_632 = 632, // unused + RBAC_PERM_COMMAND_MUTEHISTORY = 632, RBAC_PERM_COMMAND_RELOAD_CREATURE_LINKED_RESPAWN = 633, RBAC_PERM_COMMAND_RELOAD_CREATURE_LOOT_TEMPLATE = 634, RBAC_PERM_COMMAND_RELOAD_CREATURE_ONKILL_REPUTATION = 635, @@ -698,6 +698,8 @@ enum RBACPermissions RBAC_PERM_COMMAND_AHBOT_RELOAD = 792, RBAC_PERM_COMMAND_AHBOT_STATUS = 793, RBAC_PERM_COMMAND_GUILD_INFO = 794, + RBAC_PERM_COMMAND_INSTANCE_SET_BOSS_STATE = 795, + RBAC_PERM_COMMAND_INSTANCE_GET_BOSS_STATE = 796, // custom permissions 1000+ RBAC_PERM_MAX |