aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs17
1 files changed, 13 insertions, 4 deletions
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
2913 return sp; 2913 return sp;
2914 } 2914 }
2915 2915
2916 public string GetAgentHomeURI(UUID agentID)
2917 {
2918 AgentCircuitData circuit = AuthenticateHandler.GetAgentCircuitData(agentID);
2919 if (circuit != null && circuit.ServiceURLs != null && circuit.ServiceURLs.ContainsKey("HomeURI"))
2920 return circuit.ServiceURLs["HomeURI"].ToString();
2921 else
2922 return null;
2923 }
2924
2916 /// <summary> 2925 /// <summary>
2917 /// Cache the user name for later use. 2926 /// Cache the user name for later use.
2918 /// </summary> 2927 /// </summary>
@@ -4028,12 +4037,12 @@ namespace OpenSim.Region.Framework.Scenes
4028 { 4037 {
4029 if (posX < 0) 4038 if (posX < 0)
4030 posX = 0; 4039 posX = 0;
4031 else if (posX >= 256) 4040 else if (posX >= RegionInfo.RegionSizeX)
4032 posX = 255.999f; 4041 posX = RegionInfo.RegionSizeX - 0.5f;
4033 if (posY < 0) 4042 if (posY < 0)
4034 posY = 0; 4043 posY = 0;
4035 else if (posY >= 256) 4044 else if (posY >= RegionInfo.RegionSizeY)
4036 posY = 255.999f; 4045 posY = RegionInfo.RegionSizeY - 0.5f;
4037 4046
4038 reason = String.Empty; 4047 reason = String.Empty;
4039 if (Permissions.IsGod(agentID)) 4048 if (Permissions.IsGod(agentID))