aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorubit2012-08-03 11:42:36 +0200
committerubit2012-08-03 11:42:36 +0200
commit8928b8a73018043eff3625275b47086ac9aac849 (patch)
tree07cf0dc137231ea40f7259c3a8fa9cdb2af1bbe6 /OpenSim/Region
parent merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster... (diff)
parentMake sure the position of a loggin-in agent is within region boundaries since (diff)
downloadopensim-SC-8928b8a73018043eff3625275b47086ac9aac849.zip
opensim-SC-8928b8a73018043eff3625275b47086ac9aac849.tar.gz
opensim-SC-8928b8a73018043eff3625275b47086ac9aac849.tar.bz2
opensim-SC-8928b8a73018043eff3625275b47086ac9aac849.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs9
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;