OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-08-03 11:42:36 +02:00
parent 254d3e1ad3 3460319f1e
commit 8928b8a730
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3886,6 +3886,15 @@ namespace OpenSim.Region.Framework.Scenes
public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY) public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY)
{ {
if (posX < 0)
posX = 0;
else if (posX >= 256)
posX = 255.999f;
if (posY < 0)
posY = 0;
else if (posY >= 256)
posY = 255.999f;
reason = String.Empty; reason = String.Empty;
if (Permissions.IsGod(agentID)) if (Permissions.IsGod(agentID))
return true; return true;

1
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@ -86,6 +86,7 @@ namespace OpenSim.Services.Connectors.Simulation
reason = String.Empty; reason = String.Empty;
if (destination == null) if (destination == null)
{ {
reason = "Destination not found";
m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null"); m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null");
return false; return false;
} }