diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-08 00:10:19 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-08 00:10:19 -0400 |
commit | bff26ccdbb94fbdf9623b0b00a16ef88549e648e (patch) | |
tree | 96b56e7c29b16f057ec8727744e2c920a34f51e9 /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-bff26ccdbb94fbdf9623b0b00a16ef88549e648e.zip opensim-SC_OLD-bff26ccdbb94fbdf9623b0b00a16ef88549e648e.tar.gz opensim-SC_OLD-bff26ccdbb94fbdf9623b0b00a16ef88549e648e.tar.bz2 opensim-SC_OLD-bff26ccdbb94fbdf9623b0b00a16ef88549e648e.tar.xz |
* More tweaking of the various services to work with nonstandard region sizes. * Now, what's available of the terrain will show and it'll be truncated if it's larger on Linden Clients. Parcel minimum is 64 (256/4) for the client to accept it.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e344da3..7f1936e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2494,6 +2494,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2494 | 2494 | ||
2495 | if (!agent.child) | 2495 | if (!agent.child) |
2496 | { | 2496 | { |
2497 | if (agent.startpos.X > (int)Constants.RegionSize - 1) | ||
2498 | agent.startpos.X = (int)Constants.RegionSize - 1; | ||
2499 | |||
2500 | if (agent.startpos.Y > (int)Constants.RegionSize - 1) | ||
2501 | agent.startpos.Y = (int)Constants.RegionSize - 1; | ||
2502 | |||
2497 | // Honor parcel landing type and position. | 2503 | // Honor parcel landing type and position. |
2498 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); | 2504 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); |
2499 | if (land != null) | 2505 | if (land != null) |