Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4

Browse Source 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Accounts/RBAC.h
	src/server/scripts/Commands/cs_modify.cpp
This commit is contained in:
Carbenium
2015-07-21 19:02:53 +02:00
parent fc13ce42df 251a347190
commit c0ee4ceac4
15 changed files with 125 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/base/auth_database.sql
View File

@@ -508,7 +508,7 @@ CREATE TABLE `rbac_default_permissions` (
LOCK TABLES `rbac_default_permissions` WRITE;
/*!40000 ALTER TABLE `rbac_default_permissions` DISABLE KEYS */;
INSERT INTO `rbac_default_permissions` VALUES (0,195),(1,194),(2,193),(3,192);
INSERT INTO `rbac_default_permissions` VALUES (3,192),(2,193),(1,194),(0,195);
/*!40000 ALTER TABLE `rbac_default_permissions` ENABLE KEYS */;
UNLOCK TABLES;
@@ -661,4 +661,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2014-10-18 23:33:11
-- Dump completed on 2014-11-11 0:38:41