diff options
author | Melanie | 2009-09-27 21:58:34 +0100 |
---|---|---|
committer | Melanie | 2009-09-27 21:58:34 +0100 |
commit | 12640d082473d521f5131b640239013e56c8edd2 (patch) | |
tree | 21f6f07633b7fdbd30dac90a9a7af98e275b1113 | |
parent | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-12640d082473d521f5131b640239013e56c8edd2.zip opensim-SC-12640d082473d521f5131b640239013e56c8edd2.tar.gz opensim-SC-12640d082473d521f5131b640239013e56c8edd2.tar.bz2 opensim-SC-12640d082473d521f5131b640239013e56c8edd2.tar.xz |
Prevent manually setting Data["locX"] and Data["locY"], since that would
overwrite the posX and posY members of the structure
-rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 4 |
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 | ||