Merge branch 'master' into m_test

3 files changed, 14 insertions, 6 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
index 9164ffe..bfef682 100644
--- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
@@ -278,7 +278,7 @@ namespace OpenSim.Data.MSSQL
 //            m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
 //            Util.PrintCallStack();
 
-            string sql = "update inventoryfolders set version=version+1 where folderID = ?folderID";
+            string sql = "update inventoryfolders set version=version+1 where folderID = @folderID";
             
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
             {
diff --git a/OpenSim/Data/MSSQL/Resources/EstateStore.migrations b/OpenSim/Data/MSSQL/Resources/EstateStore.migrations
index 64b2d2b..b5b1b18 100644
--- a/OpenSim/Data/MSSQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/EstateStore.migrations
@@ -331,4 +331,12 @@ ALTER TABLE dbo.estate_map ADD CONSTRAINT
 
 COMMIT
 
+:VERSION 10
 
+BEGIN transaction
+
+ALTER TABLE estate_settings ADD AllowLandmark tinyint NOT NULL default 1;
+ALTER TABLE estate_settings ADD AllowParcelChanges tinyint NOT NULL default 1;
+ALTER TABLE estate_settings ADD AllowSetHome tinyint NOT NULL default 1;
+
+COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
index bb89884..46b1988 100644
--- a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
@@ -1161,11 +1161,11 @@ COMMIT
 
 BEGIN TRANSACTION
 
-ALTER TABLE prims ADD `PhysicsShapeType` tinyint(4) NOT NULL default '0';
-ALTER TABLE prims ADD `Density` double NOT NULL default '1000';
-ALTER TABLE prims ADD `GravityModifier` double NOT NULL default '1';
-ALTER TABLE prims ADD `Friction` double NOT NULL default '0.6';
-ALTER TABLE prims ADD `Restitution` double NOT NULL default '0.5';
+ALTER TABLE prims ADD PhysicsShapeType tinyint NOT NULL default 0;
+ALTER TABLE prims ADD Density float NOT NULL default 1000;
+ALTER TABLE prims ADD GravityModifier float NOT NULL default 1;
+ALTER TABLE prims ADD Friction float NOT NULL default 0.6;
+ALTER TABLE prims ADD Restitution float NOT NULL default 0.5;
 
 COMMIT