Merge commit '4153cfbf14132931b981168b7b3e7c5b8d5be8b5'

avinationmerge
Melanie Thielker 2014-06-21 00:22:29 +02:00
commit e0f360e495
1 changed files with 6 additions and 6 deletions

View File

@ -1153,7 +1153,7 @@ COMMIT
BEGIN TRANSACTION BEGIN TRANSACTION
ALTER TABLE prims ADD COLUMN DynAttrs TEXT; ALTER TABLE prims ADD DynAttrs TEXT;
COMMIT COMMIT
@ -1161,10 +1161,10 @@ COMMIT
BEGIN TRANSACTION BEGIN TRANSACTION
ALTER TABLE prims ADD COLUMN `PhysicsShapeType` tinyint(4) NOT NULL default '0'; ALTER TABLE prims ADD `PhysicsShapeType` tinyint(4) NOT NULL default '0';
ALTER TABLE prims ADD COLUMN `Density` double NOT NULL default '1000'; ALTER TABLE prims ADD `Density` double NOT NULL default '1000';
ALTER TABLE prims ADD COLUMN `GravityModifier` double NOT NULL default '1'; ALTER TABLE prims ADD `GravityModifier` double NOT NULL default '1';
ALTER TABLE prims ADD COLUMN `Friction` double NOT NULL default '0.6'; ALTER TABLE prims ADD `Friction` double NOT NULL default '0.6';
ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5'; ALTER TABLE prims ADD `Restitution` double NOT NULL default '0.5';
COMMIT COMMIT