aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLRegionData.cs
diff options
context:
space:
mode:
authorDiva Canto2009-09-24 18:23:55 -0700
committerDiva Canto2009-09-24 18:23:55 -0700
commit6a5d7650d02979c74abcbbb3595729a4a6b55411 (patch)
tree85271d3382223cc9a851309dd707be127554da47 /OpenSim/Data/MySQL/MySQLRegionData.cs
parentGridServerPostHandler finished. GridClient tests all work. More guards on get... (diff)
downloadopensim-SC_OLD-6a5d7650d02979c74abcbbb3595729a4a6b55411.zip
opensim-SC_OLD-6a5d7650d02979c74abcbbb3595729a4a6b55411.tar.gz
opensim-SC_OLD-6a5d7650d02979c74abcbbb3595729a4a6b55411.tar.bz2
opensim-SC_OLD-6a5d7650d02979c74abcbbb3595729a4a6b55411.tar.xz
All tests pass for MySQL/MySQLRegionData.
Added OpenSim.GridServer.ini.example that I have been using for testing the ROBUST grid service with the GridClient.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLRegionData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs15
1 files changed, 3 insertions, 12 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index ced26a4..e13e12c 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Data.MySQL
77 cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString()); 77 cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
78 78
79 List<RegionData> ret = RunCommand(cmd); 79 List<RegionData> ret = RunCommand(cmd);
80 if (ret == null) 80 if (ret.Count == 0)
81 return null; 81 return null;
82 82
83 return ret[0]; 83 return ret[0];
@@ -95,7 +95,7 @@ namespace OpenSim.Data.MySQL
95 cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString()); 95 cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
96 96
97 List<RegionData> ret = RunCommand(cmd); 97 List<RegionData> ret = RunCommand(cmd);
98 if (ret == null) 98 if (ret.Count == 0)
99 return null; 99 return null;
100 100
101 return ret[0]; 101 return ret[0];
@@ -170,10 +170,7 @@ namespace OpenSim.Data.MySQL
170 result.Close(); 170 result.Close();
171 CloseReaderCommand(cmd); 171 CloseReaderCommand(cmd);
172 172
173 if (retList.Count > 0) 173 return retList;
174 return retList;
175
176 return null;
177 } 174 }
178 175
179 public bool Store(RegionData data) 176 public bool Store(RegionData data)
@@ -182,12 +179,6 @@ namespace OpenSim.Data.MySQL
182 data.Data.Remove("uuid"); 179 data.Data.Remove("uuid");
183 if (data.Data.ContainsKey("ScopeID")) 180 if (data.Data.ContainsKey("ScopeID"))
184 data.Data.Remove("ScopeID"); 181 data.Data.Remove("ScopeID");
185 if (data.Data.ContainsKey("regionName"))
186 data.Data.Remove("regionName");
187 if (data.Data.ContainsKey("posX"))
188 data.Data.Remove("posX");
189 if (data.Data.ContainsKey("posY"))
190 data.Data.Remove("posY");
191 182
192 string[] fields = new List<string>(data.Data.Keys).ToArray(); 183 string[] fields = new List<string>(data.Data.Keys).ToArray();
193 184