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/LLLoginService | |
| 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/LLLoginService')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 6a0a799..e67ecf0 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
| @@ -259,7 +259,6 @@ namespace OpenSim.Services.LLLoginService | |||
| 259 | 259 | ||
| 260 | FillOutRegionData(destination); | 260 | FillOutRegionData(destination); |
| 261 | m_log.DebugFormat("[LOGIN RESPONSE] LLLoginResponse create. sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY); | 261 | m_log.DebugFormat("[LOGIN RESPONSE] LLLoginResponse create. sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY); |
| 262 | Util.PrintCallStack(); | ||
| 263 | 262 | ||
| 264 | FillOutSeedCap(aCircuit, destination, clientIP); | 263 | FillOutSeedCap(aCircuit, destination, clientIP); |
| 265 | 264 | ||