diff options
| author | Melanie | 2012-08-03 02:20:57 +0200 |
|---|---|---|
| committer | Melanie | 2012-08-03 02:20:57 +0200 |
| commit | 3460319f1e4eab5529df83f9c873a14df414d525 (patch) | |
| tree | af513a2588b7a7f9a9aae0922bc0a2ca5b89d2b2 /OpenSim/Region | |
| parent | Add a reason message for a code path that lacks one (diff) | |
| download | opensim-SC_OLD-3460319f1e4eab5529df83f9c873a14df414d525.zip opensim-SC_OLD-3460319f1e4eab5529df83f9c873a14df414d525.tar.gz opensim-SC_OLD-3460319f1e4eab5529df83f9c873a14df414d525.tar.bz2 opensim-SC_OLD-3460319f1e4eab5529df83f9c873a14df414d525.tar.xz | |
Make sure the position of a loggin-in agent is within region boundaries since
out of bounds positions cause a rejection of the login.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 3a28d42..bf2db58 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3886,6 +3886,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3886 | 3886 | ||
| 3887 | public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY) | 3887 | public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY) |
| 3888 | { | 3888 | { |
| 3889 | if (posX < 0) | ||
| 3890 | posX = 0; | ||
| 3891 | else if (posX >= 256) | ||
| 3892 | posX = 255.999f; | ||
| 3893 | if (posY < 0) | ||
| 3894 | posY = 0; | ||
| 3895 | else if (posY >= 256) | ||
| 3896 | posY = 255.999f; | ||
| 3897 | |||
| 3889 | reason = String.Empty; | 3898 | reason = String.Empty; |
| 3890 | if (Permissions.IsGod(agentID)) | 3899 | if (Permissions.IsGod(agentID)) |
| 3891 | return true; | 3900 | return true; |