aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local/LocalUserServices.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/Local/LocalUserServices.cs')
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs13
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index db9d9b9..b441a8d 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -18,13 +18,15 @@ namespace OpenSim.Region.Communications.Local
18 { 18 {
19 private CommunicationsLocal m_Parent; 19 private CommunicationsLocal m_Parent;
20 20
21 private NetworkServersInfo serversInfo;
21 private uint defaultHomeX ; 22 private uint defaultHomeX ;
22 private uint defaultHomeY; 23 private uint defaultHomeY;
23 public LocalUserServices(CommunicationsLocal parent, uint defHomeX, uint defHomeY) 24 public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversData)
24 { 25 {
25 m_Parent = parent; 26 m_Parent = parent;
26 defaultHomeX = defHomeX; 27 this.serversInfo = serversData;
27 defaultHomeY = defHomeY; 28 defaultHomeX = this.serversInfo.DefaultHomeLocX;
29 defaultHomeY = this.serversInfo.DefaultHomeLocY;
28 } 30 }
29 31
30 public UserProfileData GetUserProfile(string firstName, string lastName) 32 public UserProfileData GetUserProfile(string firstName, string lastName)
@@ -81,7 +83,6 @@ namespace OpenSim.Region.Communications.Local
81 ulong currentRegion = theUser.currentAgent.currentHandle; 83 ulong currentRegion = theUser.currentAgent.currentHandle;
82 RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion); 84 RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);
83 85
84
85 if (reg != null) 86 if (reg != null)
86 { 87 {
87 response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " + 88 response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " +
@@ -92,7 +93,9 @@ namespace OpenSim.Region.Communications.Local
92 response.SimPort = (Int32)reg.ExternalEndPoint.Port; 93 response.SimPort = (Int32)reg.ExternalEndPoint.Port;
93 response.RegionX = reg.RegionLocX ; 94 response.RegionX = reg.RegionLocX ;
94 response.RegionY = reg.RegionLocY ; 95 response.RegionY = reg.RegionLocY ;
95 response.SeedCapability = "http://" + reg.ExternalHostName + ":" + reg.ExternalEndPoint.Port.ToString() + "/CAPS/" + capsPath + "0000/"; 96
97 //following port needs changing as we don't want a http listener for every region (or do we?)
98 response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
96 theUser.currentAgent.currentRegion = reg.SimUUID; 99 theUser.currentAgent.currentRegion = reg.SimUUID;
97 theUser.currentAgent.currentHandle = reg.RegionHandle; 100 theUser.currentAgent.currentHandle = reg.RegionHandle;
98 101