diff options
| author | UbitUmarov | 2016-11-19 15:45:41 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-19 15:45:41 +0000 |
| commit | 7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4 (patch) | |
| tree | a2ab69bce5eda122b119da082625449f92b4c3d3 /OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | REST console v2. This is an incompatible protocol change. It degrades gracefu... (diff) | |
| download | opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.zip opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.gz opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.bz2 opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.xz | |
merge conflits
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs index 86fda36..38629b2 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | |||
| @@ -579,13 +579,13 @@ namespace OpenSim.Server.Handlers.Grid | |||
| 579 | if (request.ContainsKey("SCOPEID")) | 579 | if (request.ContainsKey("SCOPEID")) |
| 580 | UUID.TryParse(request["SCOPEID"].ToString(), out scopeID); | 580 | UUID.TryParse(request["SCOPEID"].ToString(), out scopeID); |
| 581 | else | 581 | else |
| 582 | m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get neighbours"); | 582 | m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get RegionFlags"); |
| 583 | 583 | ||
| 584 | UUID regionID = UUID.Zero; | 584 | UUID regionID = UUID.Zero; |
| 585 | if (request.ContainsKey("REGIONID")) | 585 | if (request.ContainsKey("REGIONID")) |
| 586 | UUID.TryParse(request["REGIONID"].ToString(), out regionID); | 586 | UUID.TryParse(request["REGIONID"].ToString(), out regionID); |
| 587 | else | 587 | else |
| 588 | m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours"); | 588 | m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get RegionFlags"); |
| 589 | 589 | ||
| 590 | int flags = m_GridService.GetRegionFlags(scopeID, regionID); | 590 | int flags = m_GridService.GetRegionFlags(scopeID, regionID); |
| 591 | // m_log.DebugFormat("[GRID HANDLER]: flags for region {0}: {1}", regionID, flags); | 591 | // m_log.DebugFormat("[GRID HANDLER]: flags for region {0}: {1}", regionID, flags); |