aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-09-27 14:59:43 -0700
committerDiva Canto2009-09-27 14:59:43 -0700
commitcde6b0d5ab402c0724270d515635af82f6f33cf6 (patch)
tree9e0331b07f34b2365bb00cbbb11cfca5ef41128a
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
parentPrevent manually setting Data["locX"] and Data["locY"], since that would (diff)
downloadopensim-SC-cde6b0d5ab402c0724270d515635af82f6f33cf6.zip
opensim-SC-cde6b0d5ab402c0724270d515635af82f6f33cf6.tar.gz
opensim-SC-cde6b0d5ab402c0724270d515635af82f6f33cf6.tar.bz2
opensim-SC-cde6b0d5ab402c0724270d515635af82f6f33cf6.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 64ac83f..8c99519 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -191,6 +191,10 @@ namespace OpenSim.Data.MySQL
191 data.Data.Remove("sizeX"); 191 data.Data.Remove("sizeX");
192 if (data.Data.ContainsKey("sizeY")) 192 if (data.Data.ContainsKey("sizeY"))
193 data.Data.Remove("sizeY"); 193 data.Data.Remove("sizeY");
194 if (data.Data.ContainsKey("locX"))
195 data.Data.Remove("locX");
196 if (data.Data.ContainsKey("locY"))
197 data.Data.Remove("locY");
194 198
195 string[] fields = new List<string>(data.Data.Keys).ToArray(); 199 string[] fields = new List<string>(data.Data.Keys).ToArray();
196 200