diff options
author | CasperW | 2009-12-26 18:14:12 +0100 |
---|---|---|
committer | CasperW | 2009-12-26 18:14:12 +0100 |
commit | 7371c7662a05d2c1dae1c110905817bb873cf934 (patch) | |
tree | 86e5ff0320631f8d400ff5a6ea902dd740fc4040 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Add a debugger tag to stop Visual Studio from breaking (diff) | |
download | opensim-SC-7371c7662a05d2c1dae1c110905817bb873cf934.zip opensim-SC-7371c7662a05d2c1dae1c110905817bb873cf934.tar.gz opensim-SC-7371c7662a05d2c1dae1c110905817bb873cf934.tar.bz2 opensim-SC-7371c7662a05d2c1dae1c110905817bb873cf934.tar.xz |
Fix for landing points. Only one scenario is not fully covered by this change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 265129c..37734f4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3460,6 +3460,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3460 | } | 3460 | } |
3461 | } | 3461 | } |
3462 | // Honor parcel landing type and position. | 3462 | // Honor parcel landing type and position. |
3463 | /* | ||
3463 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); | 3464 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); |
3464 | if (land != null) | 3465 | if (land != null) |
3465 | { | 3466 | { |
@@ -3468,6 +3469,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3468 | agent.startpos = land.LandData.UserLocation; | 3469 | agent.startpos = land.LandData.UserLocation; |
3469 | } | 3470 | } |
3470 | } | 3471 | } |
3472 | */// This is now handled properly in ScenePresence.MakeRootAgent | ||
3471 | } | 3473 | } |
3472 | 3474 | ||
3473 | m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); | 3475 | m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); |