diff options
| author | Robert Adams | 2014-01-11 08:52:23 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-11 08:52:23 -0800 |
| commit | 1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f (patch) | |
| tree | 125392101f83c8e7cb239848ae7a6cc12595b1a2 /OpenSim/Services/Interfaces | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | Fix crash in BulletSim which sometimes happens making a linkset physical (diff) | |
| download | opensim-SC_OLD-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.zip opensim-SC_OLD-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.gz opensim-SC_OLD-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.bz2 opensim-SC_OLD-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.xz | |
Merge branch 'master' into varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
Diffstat (limited to 'OpenSim/Services/Interfaces')
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 502630d..8e6279e 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
| @@ -485,8 +485,8 @@ namespace OpenSim.Services.Interfaces | |||
| 485 | if (kvp.ContainsKey("Token")) | 485 | if (kvp.ContainsKey("Token")) |
| 486 | Token = kvp["Token"].ToString(); | 486 | Token = kvp["Token"].ToString(); |
| 487 | 487 | ||
| 488 | m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>", | 488 | // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>", |
| 489 | LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY); | 489 | // LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY); |
| 490 | } | 490 | } |
| 491 | } | 491 | } |
| 492 | } | 492 | } |