Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current

Conflicts:
	bin/Regions/Regions.ini.example

1 files changed, 24 insertions, 0 deletions

diff --git a/OpenSim/Data/MySQL/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
new file mode 100644
index 0000000..7cfcd43
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
@@ -0,0 +1,24 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN;
+
+CREATE TABLE `im_offline` (
+  `ID` MEDIUMINT NOT NULL AUTO_INCREMENT,
+  `PrincipalID` char(36) NOT NULL default '',
+  `Message` text NOT NULL,
+  `TMStamp` timestamp NOT NULL,
+  PRIMARY KEY  (`ID`),
+  KEY `PrincipalID` (`PrincipalID`)
+) ENGINE=MyISAM;
+
+COMMIT;
+
+:VERSION 2         # -------------------------- 
+
+BEGIN;
+
+INSERT INTO `im_offline` SELECT * from `diva_im_offline`;
+DROP TABLE `diva_im_offline`;
+DELETE FROM `migrations` WHERE name='diva_im_Store';
+
+COMMIT;
\ No newline at end of file