Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
commit
8928b8a730
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue