From 3b26baf282f911842e5aabcb0ca2ebd80ab10dca Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 9 Aug 2010 22:54:13 +0100
Subject: Even if all data migratios are up to date, still print the current
 revision to the log

---
 OpenSim/Data/Migration.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Data')

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;
         }
     }
-- 
cgit v1.1


From 7741143fb5c7c62355170a2f795561d28b9f589f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 10 Aug 2010 11:14:24 -0700
Subject: Enforce DB limits on region name to 32 chars, or else (not good).
 Removed a piece of code from Hyperlinker that didn't work anyway. Shortened
 the hyperlink region name.

---
 OpenSim/Data/MySQL/MySQLRegionData.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Data')

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())
-- 
cgit v1.1