Merge branch 'master' into careminster-presence-refactor

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
             if (data.Data.ContainsKey("locY"))
                 data.Data.Remove("locY");
 
-            if (data.RegionName.Length > 32)
-                data.RegionName = data.RegionName.Substring(0, 32);
+            if (data.RegionName.Length > 128)
+                data.RegionName = data.RegionName.Substring(0, 128);
 
             string[] fields = new List<string>(data.Data.Keys).ToArray();
 
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;
 COMMIT;
 
 
+:VERSION 8              # ------------
+
+BEGIN;
+
+alter table regions modify column regionName varchar(128) default NULL;
+
+COMMIT;