diff options
author | Diva Canto | 2010-12-05 19:43:24 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-05 19:43:24 -0800 |
commit | 72748746d53df1c033207452a4315d93bc780158 (patch) | |
tree | e50bf963b16737946c0717ee42779b2aa5e3ff8d /OpenSim/Data | |
parent | Merge branch 'master-core' into mantis5110 (diff) | |
download | opensim-SC-72748746d53df1c033207452a4315d93bc780158.zip opensim-SC-72748746d53df1c033207452a4315d93bc780158.tar.gz opensim-SC-72748746d53df1c033207452a4315d93bc780158.tar.bz2 opensim-SC-72748746d53df1c033207452a4315d93bc780158.tar.xz |
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/GridStore.migrations | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index efefad9..d04e3dc 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
@@ -212,8 +212,8 @@ namespace OpenSim.Data.MySQL | |||
212 | if (data.Data.ContainsKey("locY")) | 212 | if (data.Data.ContainsKey("locY")) |
213 | data.Data.Remove("locY"); | 213 | data.Data.Remove("locY"); |
214 | 214 | ||
215 | if (data.RegionName.Length > 32) | 215 | if (data.RegionName.Length > 128) |
216 | data.RegionName = data.RegionName.Substring(0, 32); | 216 | data.RegionName = data.RegionName.Substring(0, 128); |
217 | 217 | ||
218 | string[] fields = new List<string>(data.Data.Keys).ToArray(); | 218 | string[] fields = new List<string>(data.Data.Keys).ToArray(); |
219 | 219 | ||
diff --git a/OpenSim/Data/MySQL/Resources/GridStore.migrations b/OpenSim/Data/MySQL/Resources/GridStore.migrations index 523a8ac..eda6dbb 100644 --- a/OpenSim/Data/MySQL/Resources/GridStore.migrations +++ b/OpenSim/Data/MySQL/Resources/GridStore.migrations | |||
@@ -87,3 +87,10 @@ ALTER TABLE `regions` ADD COLUMN `Token` varchar(255) NOT NULL; | |||
87 | COMMIT; | 87 | COMMIT; |
88 | 88 | ||
89 | 89 | ||
90 | :VERSION 8 # ------------ | ||
91 | |||
92 | BEGIN; | ||
93 | |||
94 | alter table regions modify column regionName varchar(128) default NULL; | ||
95 | |||
96 | COMMIT; | ||