aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService/UserAgentService.cs
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-02 19:17:02 -0400
committerJonathan Freedman2010-10-02 19:17:02 -0400
commit32ccc7a9d912543c0a5d3f8db839734194f3d8dd (patch)
tree9822d8a2ea479b4a8d26ae7cc4df0124db201c56 /OpenSim/Services/HypergridService/UserAgentService.cs
parentSo, the client can have an old idea of the object properties for the object w... (diff)
downloadopensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.zip
opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.gz
opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.bz2
opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.xz
* refactor refactor refactor ServerURI 4 lyfe
Diffstat (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 8acd618..4653b31 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -145,13 +145,13 @@ 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 = "http://" + region.ExternalHostName + ":" + region.HttpPort + ";" + UUID.Random(); 148 agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random();
149 TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region); 149 TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region);
150 150
151 //bool success = m_GatekeeperConnector.CreateAgent(region, agentCircuit, (uint)Constants.TeleportFlags.ViaLogin, out reason); 151 //bool success = m_GatekeeperConnector.CreateAgent(region, agentCircuit, (uint)Constants.TeleportFlags.ViaLogin, out reason);
152 bool success = false; 152 bool success = false;
153 string myExternalIP = string.Empty; 153 string myExternalIP = string.Empty;
154 string gridName = "http://" + gatekeeper.ExternalHostName + ":" + gatekeeper.HttpPort; 154 string gridName = gatekeeper.ServerURI;
155 if (m_GridName == gridName) 155 if (m_GridName == gridName)
156 success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); 156 success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason);
157 else 157 else
@@ -160,7 +160,7 @@ namespace OpenSim.Services.HypergridService
160 if (!success) 160 if (!success)
161 { 161 {
162 m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", 162 m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}",
163 agentCircuit.firstname, agentCircuit.lastname, region.ExternalHostName + ":" + region.HttpPort, reason); 163 agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
164 164
165 // restore the old travel info 165 // restore the old travel info
166 lock (m_TravelingAgents) 166 lock (m_TravelingAgents)
@@ -206,7 +206,7 @@ namespace OpenSim.Services.HypergridService
206 m_TravelingAgents[agentCircuit.SessionID] = travel; 206 m_TravelingAgents[agentCircuit.SessionID] = travel;
207 } 207 }
208 travel.UserID = agentCircuit.AgentID; 208 travel.UserID = agentCircuit.AgentID;
209 travel.GridExternalName = "http://" + region.ExternalHostName + ":" + region.HttpPort; 209 travel.GridExternalName = region.ServerURI;
210 travel.ServiceToken = agentCircuit.ServiceSessionID; 210 travel.ServiceToken = agentCircuit.ServiceSessionID;
211 if (old != null) 211 if (old != null)
212 travel.ClientIPAddress = old.ClientIPAddress; 212 travel.ClientIPAddress = old.ClientIPAddress;