aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer.Modules/GridDBService.cs
diff options
context:
space:
mode:
authorDiva Canto2009-08-19 17:36:34 -0700
committerDiva Canto2009-08-19 17:36:34 -0700
commita3db2936f7b9297815244d39cdb33c26d17c70e2 (patch)
tree6f5c6626f94f878a020412f348dcbc51aadd2312 /OpenSim/Grid/GridServer.Modules/GridDBService.cs
parentFixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in ... (diff)
parentFixing a spot I missed in assets. Switching Grid to the new naming schema wit... (diff)
downloadopensim-SC-a3db2936f7b9297815244d39cdb33c26d17c70e2.zip
opensim-SC-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.gz
opensim-SC-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.bz2
opensim-SC-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/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.");