diff options
author | Justin Clark-Casey (justincc) | 2010-08-10 20:17:47 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-10 20:17:47 +0100 |
commit | 158604a733b9314f0209896100505e0e5f008c89 (patch) | |
tree | 90cfb433b84e511dcfe5eec58bb11e77203389b5 /OpenSim/Data/MySQL | |
parent | On shift-copy of an object, set up a new physics actor (as appropriate) for e... (diff) | |
parent | This file wants to be committed (diff) | |
download | opensim-SC-158604a733b9314f0209896100505e0e5f008c89.zip opensim-SC-158604a733b9314f0209896100505e0e5f008c89.tar.gz opensim-SC-158604a733b9314f0209896100505e0e5f008c89.tar.bz2 opensim-SC-158604a733b9314f0209896100505e0e5f008c89.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 3 |
1 files changed, 3 insertions, 0 deletions
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()) |