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

remove a 256m check

avinationmerge
UbitUmarov 2015-08-21 00:35:55 +01:00
parent 512c892d83
commit f6a59f74ab
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2913,6 +2913,15 @@ namespace OpenSim.Region.Framework.Scenes
return sp; return sp;
} }
public string GetAgentHomeURI(UUID agentID)
{
AgentCircuitData circuit = AuthenticateHandler.GetAgentCircuitData(agentID);
if (circuit != null && circuit.ServiceURLs != null && circuit.ServiceURLs.ContainsKey("HomeURI"))
return circuit.ServiceURLs["HomeURI"].ToString();
else
return null;
}
/// <summary> /// <summary>
/// Cache the user name for later use. /// Cache the user name for later use.
/// </summary> /// </summary>
@ -4028,12 +4037,12 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (posX < 0) if (posX < 0)
posX = 0; posX = 0;
else if (posX >= 256) else if (posX >= RegionInfo.RegionSizeX)
posX = 255.999f; posX = RegionInfo.RegionSizeX - 0.5f;
if (posY < 0) if (posY < 0)
posY = 0; posY = 0;
else if (posY >= 256) else if (posY >= RegionInfo.RegionSizeY)
posY = 255.999f; posY = RegionInfo.RegionSizeY - 0.5f;
reason = String.Empty; reason = String.Empty;
if (Permissions.IsGod(agentID)) if (Permissions.IsGod(agentID))