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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h

3 files changed, 16 insertions, 0 deletions

diff --git a/sql/updates/auth/2014_01_19_01_auth_rbac_permissions.sql b/sql/updates/auth/2014_01_19_01_auth_rbac_permissions.sql
new file mode 100644
index 00000000000..7866de3d766
--- /dev/null
+++ b/sql/updates/auth/2014_01_19_01_auth_rbac_permissions.sql
@@ -0,0 +1,13 @@
+SET @oldId = 775;
+SET @id = 777;
+
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id`=@oldId;
+DELETE FROM `rbac_permissions` WHERE `id`=@id;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(@id, 'Command: mailbox');
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=@oldId;
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=@id;
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(196, @id);
diff --git a/sql/updates/world/2014_01_19_02_world_command.sql b/sql/updates/world/2014_01_19_02_world_command.sql
new file mode 100644
index 00000000000..09509488c85
--- /dev/null
+++ b/sql/updates/world/2014_01_19_02_world_command.sql
@@ -0,0 +1 @@
+UPDATE `command` SET `permission`=777 WHERE `name`='mailbox';
diff --git a/sql/updates/world/2014_01_21_world_sai.sql b/sql/updates/world/2014_01_21_world_sai.sql
new file mode 100644
index 00000000000..6ea92fc1aef
--- /dev/null
+++ b/sql/updates/world/2014_01_21_world_sai.sql
@@ -0,0 +1,2 @@
+-- Fix Saronite Mine Slave so these actually despawn when gossip option selected for quest credit
+UPDATE `smart_scripts` SET `target_type`=1 WHERE  `entryorguid`=3139700 AND `source_type`=9 AND `id`=3 AND `link`=0;