Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

2 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index c177097..86531d9 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -407,9 +407,8 @@ scan_old_style:
             }
             
             if (migrations.Count < 1) 
-            {
-                m_log.InfoFormat("[MIGRATIONS]: {0} up to date, no migrations to apply", _type);
-            }
+                m_log.DebugFormat("[MIGRATIONS]: {0} data tables already up to date at revision {1}", _type, after);
+            
             return migrations;
         }
     }
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 878b8e8..baa948e 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -210,6 +210,9 @@ 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);
+
             string[] fields = new List<string>(data.Data.Keys).ToArray();
 
             using (MySqlCommand cmd = new MySqlCommand())