diff options
author | UbitUmarov | 2015-08-21 00:35:55 +0100 |
---|---|---|
committer | UbitUmarov | 2015-08-21 00:35:55 +0100 |
commit | f6a59f74ab6b0d5f12fddfb73d724dd902075d71 (patch) | |
tree | 432ce701793f03931fba6f1b60299c580b948d20 /OpenSim/Region | |
parent | send regions size on map blocks (diff) | |
download | opensim-SC_OLD-f6a59f74ab6b0d5f12fddfb73d724dd902075d71.zip opensim-SC_OLD-f6a59f74ab6b0d5f12fddfb73d724dd902075d71.tar.gz opensim-SC_OLD-f6a59f74ab6b0d5f12fddfb73d724dd902075d71.tar.bz2 opensim-SC_OLD-f6a59f74ab6b0d5f12fddfb73d724dd902075d71.tar.xz |
remove a 256m check
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 17 |
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)) |