diff options
| author | Diva Canto | 2014-12-25 08:01:50 -0800 |
|---|---|---|
| committer | Diva Canto | 2014-12-25 08:01:50 -0800 |
| commit | 27c34b69bf5960e02b087f9f298dcbe19f03b142 (patch) | |
| tree | f299009958858da9db464dcbc84bd03beae0ca15 /OpenSim/Services/GridService | |
| parent | Revert "Update libomv to grab latest bug fixes for Collada upload." (diff) | |
| parent | If a moap entry has EnableWhiteList but WhiteList == null, then properly bloc... (diff) | |
| download | opensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.zip opensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.gz opensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.bz2 opensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/GridService')
| -rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 6 |
1 files changed, 4 insertions, 2 deletions
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; |