diff options
| author | Melanie | 2010-08-10 19:49:35 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-10 19:49:35 +0100 |
| commit | c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928 (patch) | |
| tree | f78ebe5ce10d6b5efa0700e381e751296277b7e6 /OpenSim/Data | |
| parent | Remove 4000+ DOS line endings. Grrr! (diff) | |
| parent | Changing prim color generates event CHANGED_COLOR. (diff) | |
| download | opensim-SC_OLD-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.zip opensim-SC_OLD-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.tar.gz opensim-SC_OLD-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.tar.bz2 opensim-SC_OLD-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/Migration.cs | 5 | ||||
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 3 |
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: | |||
| 407 | } | 407 | } |
| 408 | 408 | ||
| 409 | if (migrations.Count < 1) | 409 | if (migrations.Count < 1) |
| 410 | { | 410 | m_log.DebugFormat("[MIGRATIONS]: {0} data tables already up to date at revision {1}", _type, after); |
| 411 | m_log.InfoFormat("[MIGRATIONS]: {0} up to date, no migrations to apply", _type); | 411 | |
| 412 | } | ||
| 413 | return migrations; | 412 | return migrations; |
| 414 | } | 413 | } |
| 415 | } | 414 | } |
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 | |||
| 210 | if (data.Data.ContainsKey("locY")) | 210 | if (data.Data.ContainsKey("locY")) |
| 211 | data.Data.Remove("locY"); | 211 | data.Data.Remove("locY"); |
| 212 | 212 | ||
| 213 | if (data.RegionName.Length > 32) | ||
| 214 | data.RegionName = data.RegionName.Substring(0, 32); | ||
| 215 | |||
| 213 | string[] fields = new List<string>(data.Data.Keys).ToArray(); | 216 | string[] fields = new List<string>(data.Data.Keys).ToArray(); |
| 214 | 217 | ||
| 215 | using (MySqlCommand cmd = new MySqlCommand()) | 218 | using (MySqlCommand cmd = new MySqlCommand()) |