From 6ef9d4da901a346c232458317cca6268da888e2e Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 18 Aug 2008 00:39:10 +0000 Subject: Formatting cleanup. --- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 10 +++++----- OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/Communications/OGS1') diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 9a4c166..7baaa16 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -139,7 +139,7 @@ namespace OpenSim.Region.Communications.OGS1 try { XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); - + // The timeout should always be significantly larger than the timeout for the grid server to request // the initial status of the region before confirming registration. GridResp = GridReq.Send(serversInfo.GridURL, 90000); @@ -630,7 +630,7 @@ namespace OpenSim.Region.Communications.OGS1 } XmlRpcResponse resp = new XmlRpcResponse(); - + if (banned) { m_log.InfoFormat("[OGS1 GRID SERVICES]: Denying access for user {0} {1} because user is banned",agentData.firstname,agentData.lastname); @@ -645,7 +645,7 @@ namespace OpenSim.Region.Communications.OGS1 m_log.Debug("[CONNECTION DEBUGGING]: Triggering welcome for " + agentData.AgentID.ToString() + " into " + regionHandle.ToString()); m_localBackend.TriggerExpectUser(regionHandle, agentData); m_log.Info("[OGS1 GRID SERVICES]: Welcoming new user..."); - Hashtable respdata = new Hashtable(); + Hashtable respdata = new Hashtable(); respdata["success"] = "TRUE"; resp.Value = respdata; @@ -1638,10 +1638,10 @@ namespace OpenSim.Region.Communications.OGS1 hash["region_handle"] = regionHandle.ToString(); hash["x"] = x.ToString(); hash["y"] = y.ToString(); - + IList paramList = new ArrayList(); paramList.Add(hash); - + // this might be cached, as we probably requested it just a moment ago... RegionInfo info = RequestNeighbourInfo(regionHandle); diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 06a28d0..1d86646 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs @@ -252,7 +252,7 @@ namespace OpenSim.Region.Communications.OGS1 IList parameters = new ArrayList(); parameters.Add(param); XmlRpcRequest req = new XmlRpcRequest("logout_of_simulator", parameters); - + try { req.Send(m_parent.NetworkServersInfo.UserURL, 3000); @@ -262,7 +262,7 @@ namespace OpenSim.Region.Communications.OGS1 m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff"); } } - + public UserProfileData GetUserProfile(string firstName, string lastName) { return GetUserProfile(firstName + " " + lastName); @@ -711,7 +711,7 @@ namespace OpenSim.Region.Communications.OGS1 public AvatarAppearance GetUserAppearance(LLUUID user) { AvatarAppearance appearance = null; - + try { Hashtable param = new Hashtable(); @@ -722,14 +722,14 @@ namespace OpenSim.Region.Communications.OGS1 XmlRpcRequest req = new XmlRpcRequest("get_avatar_appearance", parameters); XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000); Hashtable respData = (Hashtable) resp.Value; - + return ConvertXMLRPCDataToAvatarAppearance(respData); } catch (WebException e) { m_log.ErrorFormat("[OGS1 USER SERVICES]: Network problems when trying to fetch appearance for avatar {0}, {1}", user, e.Message); } - + return appearance; } -- cgit v1.1