diff options
| author | Robert Adams | 2014-01-19 07:38:53 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-19 07:38:53 -0800 |
| commit | f127e4b4ee916a429ef1d9922432869d4138e214 (patch) | |
| tree | be90e6cea8d61088e8380e7027881a8d13f67849 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
| parent | varregion: Update Warp3D to properly handle varregions. (diff) | |
| parent | Fix casting error for float type INI file parameter parsing. (diff) | |
| download | opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.zip opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.gz opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.bz2 opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 4ab36a5..85e8159 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1433,7 +1433,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1433 | public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos) | 1433 | public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos) |
| 1434 | { | 1434 | { |
| 1435 | version = String.Empty; | 1435 | version = String.Empty; |
| 1436 | newpos = new Vector3(pos.X, pos.Y, pos.Z); | 1436 | newpos = pos; |
| 1437 | 1437 | ||
| 1438 | // m_log.DebugFormat( | 1438 | // m_log.DebugFormat( |
| 1439 | // "[ENTITY TRANSFER MODULE]: Crossing agent {0} at pos {1} in {2}", agent.Name, pos, scene.Name); | 1439 | // "[ENTITY TRANSFER MODULE]: Crossing agent {0} at pos {1} in {2}", agent.Name, pos, scene.Name); |