diff options
Diffstat (limited to '')
3 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index eef492d..e814c45 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
168 | string filename = string.Empty; | 168 | string filename = string.Empty; |
169 | 169 | ||
170 | try | 170 | try |
171 | { | 171 | { |
172 | //m_log.Debug("JPEG: " + imageURL); | 172 | //m_log.Debug("JPEG: " + imageURL); |
173 | string name = regionID.ToString(); | 173 | string name = regionID.ToString(); |
174 | filename = Path.Combine(storagePath, name + ".jpg"); | 174 | filename = Path.Combine(storagePath, name + ".jpg"); |
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs index b5e6d69..91e1740 100644 --- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs | |||
@@ -33,7 +33,7 @@ using Nini.Config; | |||
33 | 33 | ||
34 | namespace OpenSim.Services.Connectors | 34 | namespace OpenSim.Services.Connectors |
35 | { | 35 | { |
36 | public class HeloServicesConnector | 36 | public class HeloServicesConnector |
37 | { | 37 | { |
38 | private static readonly ILog m_log = | 38 | private static readonly ILog m_log = |
39 | LogManager.GetLogger( | 39 | LogManager.GetLogger( |
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 1b45bcf..b261675 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
113 | return "homeagent/"; | 113 | return "homeagent/"; |
114 | } | 114 | } |
115 | 115 | ||
116 | // The Login service calls this interface with fromLogin=true | 116 | // The Login service calls this interface with fromLogin=true |
117 | // Sims call it with fromLogin=false | 117 | // Sims call it with fromLogin=false |
118 | // Either way, this is verified by the handler | 118 | // Either way, this is verified by the handler |
119 | public bool LoginAgentToGrid(GridRegion source, AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, bool fromLogin, out string reason) | 119 | public bool LoginAgentToGrid(GridRegion source, AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, bool fromLogin, out string reason) |
@@ -159,7 +159,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
159 | } | 159 | } |
160 | 160 | ||
161 | public void SetClientToken(UUID sessionID, string token) | 161 | public void SetClientToken(UUID sessionID, string token) |
162 | { | 162 | { |
163 | // no-op | 163 | // no-op |
164 | } | 164 | } |
165 | 165 | ||
@@ -416,7 +416,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
416 | 416 | ||
417 | XmlRpcRequest request = new XmlRpcRequest("get_online_friends", paramList); | 417 | XmlRpcRequest request = new XmlRpcRequest("get_online_friends", paramList); |
418 | // string reason = string.Empty; | 418 | // string reason = string.Empty; |
419 | 419 | ||
420 | // Send and get reply | 420 | // Send and get reply |
421 | List<UUID> online = new List<UUID>(); | 421 | List<UUID> online = new List<UUID>(); |
422 | XmlRpcResponse response = null; | 422 | XmlRpcResponse response = null; |
@@ -497,7 +497,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
497 | hash["userID"] = userID.ToString(); | 497 | hash["userID"] = userID.ToString(); |
498 | 498 | ||
499 | hash = CallServer("get_server_urls", hash); | 499 | hash = CallServer("get_server_urls", hash); |
500 | 500 | ||
501 | Dictionary<string, object> serverURLs = new Dictionary<string, object>(); | 501 | Dictionary<string, object> serverURLs = new Dictionary<string, object>(); |
502 | foreach (object key in hash.Keys) | 502 | foreach (object key in hash.Keys) |
503 | { | 503 | { |
@@ -516,7 +516,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
516 | Hashtable hash = new Hashtable(); | 516 | Hashtable hash = new Hashtable(); |
517 | hash["userID"] = userID.ToString(); | 517 | hash["userID"] = userID.ToString(); |
518 | 518 | ||
519 | hash = CallServer("locate_user", hash); | 519 | hash = CallServer("locate_user", hash); |
520 | 520 | ||
521 | string url = string.Empty; | 521 | string url = string.Empty; |
522 | 522 | ||
@@ -574,7 +574,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
574 | { | 574 | { |
575 | // We can not use m_ServerURL here anymore because it causes | 575 | // We can not use m_ServerURL here anymore because it causes |
576 | // the HTTP request to be built without a host name. This messes | 576 | // the HTTP request to be built without a host name. This messes |
577 | // with OSGrid's NGINX and can make OSGrid avatars unable to TP | 577 | // with OSGrid's NGINX and can make OSGrid avatars unable to TP |
578 | // to other grids running recent mono. | 578 | // to other grids running recent mono. |
579 | response = request.Send(m_ServerURLHost, 10000); | 579 | response = request.Send(m_ServerURLHost, 10000); |
580 | } | 580 | } |