Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 24 insertions, 1 deletions

diff --git a/OpenSim/Data/MSSQL/Resources/Avatar.migrations b/OpenSim/Data/MSSQL/Resources/Avatar.migrations
index 759e939..5364153 100644
--- a/OpenSim/Data/MSSQL/Resources/Avatar.migrations
+++ b/OpenSim/Data/MSSQL/Resources/Avatar.migrations
@@ -13,5 +13,28 @@ PRIMARY KEY CLUSTERED
 ) ON [PRIMARY]
 
 
+COMMIT
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_Avatars
+        (
+        PrincipalID uniqueidentifier NOT NULL,
+        [Name] varchar(32) NOT NULL, 
+        Value text NOT NULL DEFAULT '',
+        )  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
+
 
-COMMIT
\ No newline at end of file