diff options
| author | Justin Clark-Casey (justincc) | 2014-12-03 21:40:39 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-12-03 21:40:39 +0000 |
| commit | 2d2aa6e07645b3b9f1577b41d0f73803ccafba80 (patch) | |
| tree | 5e87fee5ad3c0433d35cff586b2092697bd04a83 | |
| parent | minor: If we are recompiling scripts in response to a ScriptStopStrategy conf... (diff) | |
| download | opensim-SC_OLD-2d2aa6e07645b3b9f1577b41d0f73803ccafba80.zip opensim-SC_OLD-2d2aa6e07645b3b9f1577b41d0f73803ccafba80.tar.gz opensim-SC_OLD-2d2aa6e07645b3b9f1577b41d0f73803ccafba80.tar.bz2 opensim-SC_OLD-2d2aa6e07645b3b9f1577b41d0f73803ccafba80.tar.xz | |
minor: Just have one message that displays successful registration of a region with its parameters rather than 2
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 10 | ||||
| -rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f7c12d6..0c83186 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2042,11 +2042,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2042 | 2042 | ||
| 2043 | GridRegion region = new GridRegion(RegionInfo); | 2043 | GridRegion region = new GridRegion(RegionInfo); |
| 2044 | string error = GridService.RegisterRegion(RegionInfo.ScopeID, region); | 2044 | string error = GridService.RegisterRegion(RegionInfo.ScopeID, region); |
| 2045 | m_log.DebugFormat("{0} RegisterRegionWithGrid. name={1},id={2},loc=<{3},{4}>,size=<{5},{6}>", | 2045 | // m_log.DebugFormat("[SCENE]: RegisterRegionWithGrid. name={0},id={1},loc=<{2},{3}>,size=<{4},{5}>", |
| 2046 | LogHeader, m_regionName, | 2046 | // m_regionName, |
| 2047 | RegionInfo.RegionID, | 2047 | // RegionInfo.RegionID, |
| 2048 | RegionInfo.RegionLocX, RegionInfo.RegionLocY, | 2048 | // RegionInfo.RegionLocX, RegionInfo.RegionLocY, |
| 2049 | RegionInfo.RegionSizeX, RegionInfo.RegionSizeY); | 2049 | // RegionInfo.RegionSizeX, RegionInfo.RegionSizeY); |
| 2050 | 2050 | ||
| 2051 | if (error != String.Empty) | 2051 | if (error != String.Empty) |
| 2052 | throw new Exception(error); | 2052 | throw new Exception(error); |
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index e8a545c..29723d8 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
| @@ -317,8 +317,10 @@ namespace OpenSim.Services.GridService | |||
| 317 | m_log.DebugFormat("[GRID SERVICE]: Database exception: {0}", e); | 317 | m_log.DebugFormat("[GRID SERVICE]: Database exception: {0}", e); |
| 318 | } | 318 | } |
| 319 | 319 | ||
| 320 | m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3} with flags {4}", | 320 | m_log.DebugFormat |
| 321 | regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionCoordX, regionInfos.RegionCoordY, | 321 | ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}", |
| 322 | regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY, | ||
| 323 | regionInfos.RegionCoordX, regionInfos.RegionCoordY, | ||
| 322 | (OpenSim.Framework.RegionFlags)flags); | 324 | (OpenSim.Framework.RegionFlags)flags); |
| 323 | 325 | ||
| 324 | return String.Empty; | 326 | return String.Empty; |