aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer.Modules/GridDBService.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-20 19:25:52 -0400
committerTeravus Ovares (Dan Olivares)2009-08-20 19:25:52 -0400
commit181b992b4a8dab3423b52f705e20dcb63e7fdb47 (patch)
tree309f2255464873944a5478472596cbc24b130b27 /OpenSim/Grid/GridServer.Modules/GridDBService.cs
parent* Deal with git thinking that file was changed even though it wasn't and it's... (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.zip
opensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.gz
opensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.bz2
opensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Grid/GridServer.Modules/GridDBService.cs')
-rw-r--r--OpenSim/Grid/GridServer.Modules/GridDBService.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Grid/GridServer.Modules/GridDBService.cs b/OpenSim/Grid/GridServer.Modules/GridDBService.cs
index caa2c10..fd5a09a 100644
--- a/OpenSim/Grid/GridServer.Modules/GridDBService.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridDBService.cs
@@ -206,11 +206,11 @@ namespace OpenSim.Grid.GridServer.Modules
206 { 206 {
207 if (existingSim == null) 207 if (existingSim == null)
208 { 208 {
209 insertResponse = plugin.AddProfile(sim); 209 insertResponse = plugin.StoreProfile(sim);
210 } 210 }
211 else 211 else
212 { 212 {
213 insertResponse = plugin.UpdateProfile(sim); 213 insertResponse = plugin.StoreProfile(sim);
214 } 214 }
215 } 215 }
216 catch (Exception e) 216 catch (Exception e)
@@ -259,7 +259,7 @@ namespace OpenSim.Grid.GridServer.Modules
259 if ((reserveData != null && reserveData.gridRecvKey == theSim.regionRecvKey) || 259 if ((reserveData != null && reserveData.gridRecvKey == theSim.regionRecvKey) ||
260 (reserveData == null && authkeynode.InnerText != theSim.regionRecvKey)) 260 (reserveData == null && authkeynode.InnerText != theSim.regionRecvKey))
261 { 261 {
262 plugin.AddProfile(theSim); 262 plugin.StoreProfile(theSim);
263 m_log.Info("[grid]: New sim added to grid (" + theSim.regionName + ")"); 263 m_log.Info("[grid]: New sim added to grid (" + theSim.regionName + ")");
264 logToDB(theSim.ToString(), "RestSetSimMethod", String.Empty, 5, 264 logToDB(theSim.ToString(), "RestSetSimMethod", String.Empty, 5,
265 "Region successfully updated and connected to grid."); 265 "Region successfully updated and connected to grid.");