diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 23:35:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-22 23:35:01 +0100 |
commit | 8f34e46d7449be1c29419a232a8f7f1e5918f03c (patch) | |
tree | e1af6e01bd9be556fe652a32e4ec93c31c80a283 /OpenSim/Services/HypergridService | |
parent | Revert "* additional serveruri cleanup" (diff) | |
download | opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.zip opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.tar.gz opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.tar.bz2 opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.tar.xz |
Revert "* refactor refactor refactor ServerURI 4 lyfe"
This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98.
Diffstat (limited to 'OpenSim/Services/HypergridService')
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 9e96163..3f5c4f1 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -157,7 +157,7 @@ namespace OpenSim.Services.HypergridService | |||
157 | string regionimage = "regionImage" + region.RegionID.ToString(); | 157 | string regionimage = "regionImage" + region.RegionID.ToString(); |
158 | regionimage = regionimage.Replace("-", ""); | 158 | regionimage = regionimage.Replace("-", ""); |
159 | 159 | ||
160 | imageURL = region.ServerURI + "index.php?method=" + regionimage; | 160 | imageURL = "http://" + region.ExternalHostName + ":" + region.HttpPort + "/index.php?method=" + regionimage; |
161 | 161 | ||
162 | return true; | 162 | return true; |
163 | } | 163 | } |
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index d5dda11..eb6433c 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -145,12 +145,12 @@ namespace OpenSim.Services.HypergridService | |||
145 | region.RegionLocY = finalDestination.RegionLocY; | 145 | region.RegionLocY = finalDestination.RegionLocY; |
146 | 146 | ||
147 | // Generate a new service session | 147 | // Generate a new service session |
148 | agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); | 148 | agentCircuit.ServiceSessionID = "http://" + region.ExternalHostName + ":" + region.HttpPort + ";" + UUID.Random(); |
149 | TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region); | 149 | TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region); |
150 | 150 | ||
151 | bool success = false; | 151 | bool success = false; |
152 | string myExternalIP = string.Empty; | 152 | string myExternalIP = string.Empty; |
153 | string gridName = gatekeeper.ServerURI; | 153 | string gridName = "http://" + gatekeeper.ExternalHostName + ":" + gatekeeper.HttpPort; |
154 | if (m_GridName == gridName) | 154 | if (m_GridName == gridName) |
155 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); | 155 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); |
156 | else | 156 | else |
@@ -159,7 +159,7 @@ namespace OpenSim.Services.HypergridService | |||
159 | if (!success) | 159 | if (!success) |
160 | { | 160 | { |
161 | m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", | 161 | m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", |
162 | agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason); | 162 | agentCircuit.firstname, agentCircuit.lastname, region.ExternalHostName + ":" + region.HttpPort, reason); |
163 | 163 | ||
164 | // restore the old travel info | 164 | // restore the old travel info |
165 | lock (m_TravelingAgents) | 165 | lock (m_TravelingAgents) |
@@ -210,7 +210,7 @@ namespace OpenSim.Services.HypergridService | |||
210 | m_TravelingAgents[agentCircuit.SessionID] = travel; | 210 | m_TravelingAgents[agentCircuit.SessionID] = travel; |
211 | } | 211 | } |
212 | travel.UserID = agentCircuit.AgentID; | 212 | travel.UserID = agentCircuit.AgentID; |
213 | travel.GridExternalName = region.ServerURI; | 213 | travel.GridExternalName = "http://" + region.ExternalHostName + ":" + region.HttpPort; |
214 | travel.ServiceToken = agentCircuit.ServiceSessionID; | 214 | travel.ServiceToken = agentCircuit.ServiceSessionID; |
215 | if (old != null) | 215 | if (old != null) |
216 | travel.ClientIPAddress = old.ClientIPAddress; | 216 | travel.ClientIPAddress = old.ClientIPAddress; |