diff options
Diffstat (limited to 'OpenSim/Data/MySQL/Resources')
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 4 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/UserProfiles.migrations | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index 738f5c2..097271a 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -939,7 +939,6 @@ ALTER TABLE prims ADD COLUMN AttachedPosY double default 0; | |||
939 | ALTER TABLE prims ADD COLUMN AttachedPosZ double default 0; | 939 | ALTER TABLE prims ADD COLUMN AttachedPosZ double default 0; |
940 | ALTER TABLE primshapes ADD COLUMN LastAttachPoint int(4) not null default '0'; | 940 | ALTER TABLE primshapes ADD COLUMN LastAttachPoint int(4) not null default '0'; |
941 | COMMIT; | 941 | COMMIT; |
942 | <<<<<<< HEAD | ||
943 | 942 | ||
944 | :VERSION 50 #---- Change LandFlags to unsigned | 943 | :VERSION 50 #---- Change LandFlags to unsigned |
945 | 944 | ||
@@ -948,6 +947,3 @@ BEGIN; | |||
948 | ALTER TABLE land CHANGE COLUMN LandFlags LandFlags int unsigned default null; | 947 | ALTER TABLE land CHANGE COLUMN LandFlags LandFlags int unsigned default null; |
949 | 948 | ||
950 | COMMIT; | 949 | COMMIT; |
951 | |||
952 | ======= | ||
953 | >>>>>>> avn/ubitvar | ||
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations index 3df9b9b..87e99fa 100644 --- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations +++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations | |||
@@ -81,7 +81,6 @@ CREATE TABLE IF NOT EXISTS `userdata` ( | |||
81 | 81 | ||
82 | commit; | 82 | commit; |
83 | 83 | ||
84 | <<<<<<< HEAD | ||
85 | :VERSION 3 # ------------------------------- | 84 | :VERSION 3 # ------------------------------- |
86 | begin; | 85 | begin; |
87 | CREATE TABLE IF NOT EXISTS `usersettings` ( | 86 | CREATE TABLE IF NOT EXISTS `usersettings` ( |
@@ -97,5 +96,3 @@ commit; | |||
97 | begin; | 96 | begin; |
98 | ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255); | 97 | ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255); |
99 | commit; | 98 | commit; |
100 | ======= | ||
101 | >>>>>>> avn/ubitvar | ||