aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-05 09:47:05 +0000
committerTeravus Ovares2008-04-05 09:47:05 +0000
commitdbbb115c268e156b11fc9498d6b0028fe956f0a4 (patch)
treebe5baa24f6905728a5a05ca8bc583a92bbcc20d1 /OpenSim/Region/Environment
parentcheck in prebuild to build OpenSim.Data.NHibernate (diff)
downloadopensim-SC_OLD-dbbb115c268e156b11fc9498d6b0028fe956f0a4.zip
opensim-SC_OLD-dbbb115c268e156b11fc9498d6b0028fe956f0a4.tar.gz
opensim-SC_OLD-dbbb115c268e156b11fc9498d6b0028fe956f0a4.tar.bz2
opensim-SC_OLD-dbbb115c268e156b11fc9498d6b0028fe956f0a4.tar.xz
* The simulator now checks the parcel at the position that you get put by the grid server to see if you set it's landing point to a specified landing point. If you did, and the landing point isn't LLVector3.Zero, it puts you at the configured landing point.
* Currently the grid server sticks you at 128x128x128.. so that means it'll use whatever parcel is at that location to get this information. This allows greater customization of where people log-into and teleport-to if done right.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 64c443d..101bac3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1700,6 +1700,16 @@ namespace OpenSim.Region.Environment.Scenes
1700 if (!agent.child) 1700 if (!agent.child)
1701 { 1701 {
1702 AddCapsHandler(agent.AgentID); 1702 AddCapsHandler(agent.AgentID);
1703
1704 // Honor parcel landing type and position.
1705 ILandObject land = LandChannel.getLandObject(agent.startpos.X, agent.startpos.Y);
1706 if (land != null)
1707 {
1708 if (land.landData.landingType == (byte)1 && land.landData.userLocation != LLVector3.Zero)
1709 {
1710 agent.startpos = land.landData.userLocation;
1711 }
1712 }
1703 } 1713 }
1704 1714
1705 m_log.DebugFormat( 1715 m_log.DebugFormat(