Merge branch 'master' into careminster-presence-refactor

3 files changed, 71 insertions, 1 deletions

diff --git a/OpenSim/Data/MSSQL/Resources/Avatar.migrations b/OpenSim/Data/MSSQL/Resources/Avatar.migrations
index 5364153..61f7b56 100644
--- a/OpenSim/Data/MSSQL/Resources/Avatar.migrations
+++ b/OpenSim/Data/MSSQL/Resources/Avatar.migrations
@@ -37,4 +37,28 @@ EXECUTE sp_rename N'dbo.Tmp_Avatars', N'Avatars', 'OBJECT'
 
 COMMIT
 
+:VERSION 3
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_Avatars
+        (
+        PrincipalID uniqueidentifier NOT NULL,
+        [Name] varchar(32) NOT NULL, 
+        Value text NOT NULL DEFAULT '',
+        PRIMARY KEY CLUSTERED 
+(
+        [PrincipalID] ASC, [Name] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+)  ON [PRIMARY]
+         TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.Avatars)
+         EXEC('INSERT INTO dbo.Tmp_Avatars (PrincipalID, Name, Value)
+                SELECT PrincipalID, CONVERT(text, Name), Value FROM dbo.Avatars WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.Avatars
+
+EXECUTE sp_rename N'dbo.Tmp_Avatars', N'Avatars', 'OBJECT' 
+COMMIT
 
diff --git a/OpenSim/Data/MSSQL/Resources/GridUserStore.migrations b/OpenSim/Data/MSSQL/Resources/GridUserStore.migrations
index 7a7cecd..ecd3f4d 100644
--- a/OpenSim/Data/MSSQL/Resources/GridUserStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/GridUserStore.migrations
@@ -17,3 +17,49 @@ CREATE TABLE "GridUser" (
 ) 
 
 COMMIT
+
+:VERSION 2         # -------------------------- 
+
+BEGIN TRANSACTION
+
+CREATE TABLE [GridUser_tmp] (
+    [UserID] VARCHAR(255) NOT NULL,
+    [HomeRegionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    [HomePosition] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    [HomeLookAt] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    [LastRegionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    [LastPosition] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    [LastLookAt] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    [Online] CHAR(5) NOT NULL DEFAULT 'false',
+    [Login] CHAR(16) NOT NULL DEFAULT '0',
+    [Logout] CHAR(16) NOT NULL DEFAULT '0',
+    
+          PRIMARY KEY CLUSTERED
+                (
+                        [UserID] ASC
+                )WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+        ) ON [PRIMARY]
+
+COMMIT
+
+IF EXISTS(SELECT * FROM dbo.GridUser)
+         EXEC('INSERT INTO dbo.GridUser_tmp ([UserID]
+           ,[HomeRegionID]
+           ,[HomePosition]
+           ,[HomeLookAt]
+           ,[LastRegionID]
+           ,[LastPosition]
+           ,[LastLookAt]
+           ,[Online]
+           ,[Login]
+           ,[Logout])
+                SELECT CONVERT(varchar(36), [HomeRegionID]), [HomePosition] ,[HomeLookAt] , CONVERT(varchar(36),[LastRegionID])
+      ,[LastPosition]
+      ,[LastLookAt]
+      ,[Online]
+      ,[Login]
+      ,[Logout] FROM dbo.GridUser WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.GridUser
+
+EXECUTE sp_rename N'dbo.GridUser_tmp', N'GridUser', 'OBJECT' 
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
index 340b63d..3995e6c 100644
--- a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
@@ -1003,7 +1003,7 @@ CREATE TABLE "regionwindlight" (
   PRIMARY KEY ("region_id")
 )
 
-COMMIT TRANSACTION
+COMMIT
 
 :VERSION 26