diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
| commit | a7917b428a6bc3c9e33da64879b9e473516540a3 (patch) | |
| tree | 2c38d9c33c4977a3d0356912915082a8bd568a23 /OpenSim/Grid/GridServer.Modules | |
| parent | Patch from jhurliman to HttpServer (diff) | |
| parent | Implemented osPenCap, that sets EndCap and StartCap to Pen. This allows using... (diff) | |
| download | opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.zip opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.gz opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.bz2 opensim-SC-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Grid/GridServer.Modules')
| -rw-r--r-- | OpenSim/Grid/GridServer.Modules/GridDBService.cs | 6 |
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."); |