*Merge with Trinity 793.

--HG--
branch : trunk

3 files changed, 9 insertions, 0 deletions

diff --git a/sql/updates/783_world.sql b/sql/updates/783_world.sql
new file mode 100644
index 00000000000..24a8481e24e
--- /dev/null
+++ b/sql/updates/783_world.sql
@@ -0,0 +1,4 @@
+DELETE FROM trinity_string where entry IN (10056, 10057);
+INSERT INTO trinity_string (entry, content_default) VALUES
+(10056, 'You must be a member of the Horde to enter the Hall of Legends.'),
+(10057, 'You must be a member of the Alliance to enter the Champion\'s Hall.');
\ No newline at end of file
diff --git a/sql/updates/785_world.sql b/sql/updates/785_world.sql
new file mode 100644
index 00000000000..39b85c3871a
--- /dev/null
+++ b/sql/updates/785_world.sql
@@ -0,0 +1,4 @@
+delete from command where name in ('gobject tempadd', 'npc tempadd');
+insert into command (name, security, help) values
+('gobject tempadd','2','Adds a temporary gameobject that is not saved to DB.'),
+('npc tempadd','2','Adds temporary NPC, not saved to database.');
\ No newline at end of file
diff --git a/sql/updates/789_world.sql b/sql/updates/789_world.sql
new file mode 100644
index 00000000000..0c51d1b3fac
--- /dev/null
+++ b/sql/updates/789_world.sql
@@ -0,0 +1 @@
+ALTER TABLE eventai_texts DROP COLUMN emote;
\ No newline at end of file