From f6a59f74ab6b0d5f12fddfb73d724dd902075d71 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 21 Aug 2015 00:35:55 +0100 Subject: remove a 256m check --- OpenSim/Region/Framework/Scenes/Scene.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index fa5d021..d6a1fab 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -2913,6 +2913,15 @@ namespace OpenSim.Region.Framework.Scenes 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; + } + /// /// Cache the user name for later use. /// @@ -4028,12 +4037,12 @@ namespace OpenSim.Region.Framework.Scenes { if (posX < 0) posX = 0; - else if (posX >= 256) - posX = 255.999f; + else if (posX >= RegionInfo.RegionSizeX) + posX = RegionInfo.RegionSizeX - 0.5f; if (posY < 0) posY = 0; - else if (posY >= 256) - posY = 255.999f; + else if (posY >= RegionInfo.RegionSizeY) + posY = RegionInfo.RegionSizeY - 0.5f; reason = String.Empty; if (Permissions.IsGod(agentID)) -- cgit v1.1