From 65c5efe43b68700bad94076d4cd421160203c5de Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 16 May 2008 01:22:11 +0000 Subject: Formatting cleanup. --- OpenSim/Grid/MessagingServer/Main.cs | 10 +++--- OpenSim/Grid/MessagingServer/MessageService.cs | 42 ++++++++++++------------- OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | 10 +++--- 3 files changed, 31 insertions(+), 31 deletions(-) (limited to 'OpenSim/Grid/MessagingServer') diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index 9020ca4..7e9456d 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs @@ -45,7 +45,7 @@ namespace OpenSim.Grid.MessagingServer private MessageServerConfig Cfg; private MessageService msgsvc; - + private LLUUID m_lastCreatedUser = LLUUID.Random(); [STAThread] @@ -55,7 +55,7 @@ namespace OpenSim.Grid.MessagingServer m_log.Info("Launching MessagingServer..."); - + OpenMessage_Main messageserver = new OpenMessage_Main(); @@ -118,7 +118,7 @@ namespace OpenSim.Grid.MessagingServer switch (what) { case "user": - + try { //userID = @@ -140,12 +140,12 @@ namespace OpenSim.Grid.MessagingServer // m_lastCreatedUser = userID; break; } - } + } public override void Shutdown() { msgsvc.deregisterWithUserServer(); - + base.Shutdown(); } } diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index f9f3669..e1beef1 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs @@ -63,13 +63,13 @@ namespace OpenSim.Grid.MessagingServer { m_cfg = cfg; } - + #region RegionComms Methods #endregion #region FriendList Methods - + /// /// Process Friendlist subscriptions for a user /// The login method calls this for a User @@ -93,7 +93,7 @@ namespace OpenSim.Grid.MessagingServer { UserPresenceData friendup = (UserPresenceData)m_presences[uFriendList[i].Friend]; // Add backreference - + SubscribeToPresenceUpdates(userpresence, friendup, uFriendList[i],i); } } @@ -101,14 +101,14 @@ namespace OpenSim.Grid.MessagingServer /// /// Does the necessary work to subscribe one agent to another's presence notifications - /// Gets called by ProcessFriendListSubscriptions. You shouldn't call this directly + /// Gets called by ProcessFriendListSubscriptions. You shouldn't call this directly /// unless you know what you're doing /// /// P1 /// P2 /// /// - public void SubscribeToPresenceUpdates(UserPresenceData userpresence, UserPresenceData friendpresence, + public void SubscribeToPresenceUpdates(UserPresenceData userpresence, UserPresenceData friendpresence, FriendListItem uFriendListItem, int uFriendListIndex) { if ((uFriendListItem.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0) @@ -117,7 +117,7 @@ namespace OpenSim.Grid.MessagingServer if (!friendpresence.subscriptionData.Contains(friendpresence.agentData.AgentID)) { userpresence.subscriptionData.Add(friendpresence.agentData.AgentID); - //Send Region Notice.... + //Send Region Notice.... } else { @@ -149,13 +149,13 @@ namespace OpenSim.Grid.MessagingServer WaitCallback cb2 = new WaitCallback(friendlistupdater.go); ThreadPool.QueueUserWorkItem(cb2); - + //SendRegionPresenceUpdate(userpresence, friendpresence); } } /// - /// Adds a backreference so presence specific data doesn't have to be + /// Adds a backreference so presence specific data doesn't have to be /// enumerated for each logged in user every time someone logs on or off. /// /// @@ -194,7 +194,7 @@ namespace OpenSim.Grid.MessagingServer presenseBackReferences.Remove(agentID); } - // If there are no more backreferences for this agent, + // If there are no more backreferences for this agent, // remove it to free up memory. if (presenseBackReferences.Count == 0) { @@ -276,7 +276,7 @@ namespace OpenSim.Grid.MessagingServer } } } - + #endregion #region UserServer Comms @@ -342,7 +342,7 @@ namespace OpenSim.Grid.MessagingServer /// /// UserServer sends an expect_user method - /// this handles the method and provisions the + /// this handles the method and provisions the /// necessary info for presence to work /// /// UserServer Data @@ -398,9 +398,9 @@ namespace OpenSim.Grid.MessagingServer return new XmlRpcResponse(); } - + /// - /// The UserServer got a Logoff message + /// The UserServer got a Logoff message /// Cleanup time for that user. Send out presence notifications /// /// @@ -408,7 +408,7 @@ namespace OpenSim.Grid.MessagingServer public XmlRpcResponse UserLoggedOff(XmlRpcRequest request) { Hashtable requestData = (Hashtable)request.Params[0]; - + LLUUID AgentID = new LLUUID((string)requestData["agentid"]); ProcessLogOff(AgentID); @@ -433,7 +433,7 @@ namespace OpenSim.Grid.MessagingServer { regionInfo = (RegionProfileData)m_regionInfoCache[regionhandle]; } - else + else { regionInfo = RequestRegionInfo(regionhandle); } @@ -457,7 +457,7 @@ namespace OpenSim.Grid.MessagingServer SendParams.Add(requestData); XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams); XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000); - + Hashtable responseData = (Hashtable)GridResp.Value; if (responseData.ContainsKey("error")) @@ -479,7 +479,7 @@ namespace OpenSim.Grid.MessagingServer regionProfile.regionHandle = Helpers.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize)); regionProfile.regionLocX = regX; regionProfile.regionLocY = regY; - + regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]); regionProfile.UUID = new LLUUID((string)responseData["region_UUID"]); regionProfile.regionName = (string)responseData["region_name"]; @@ -498,7 +498,7 @@ namespace OpenSim.Grid.MessagingServer " - Is the GridServer down?"); return null; } - + return regionProfile; } @@ -506,19 +506,19 @@ namespace OpenSim.Grid.MessagingServer { Hashtable UserParams = new Hashtable(); // Login / Authentication - + if (m_cfg.HttpSSL) { UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; } - else + else { UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; } UserParams["recvkey"] = m_cfg.UserRecvKey; UserParams["sendkey"] = m_cfg.UserRecvKey; - + // Package into an XMLRPC Request ArrayList SendParams = new ArrayList(); SendParams.Add(UserParams); diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs index df3bc22..a0aeacc 100644 --- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs +++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs @@ -48,9 +48,9 @@ namespace OpenSim.Grid.MessagingServer : base("GET", "/presence") { m_log.Info("[REST]: In Get Request"); - + } - + public override byte[] Handle(string path, Stream request) { string param = GetParam(path); @@ -61,8 +61,8 @@ namespace OpenSim.Grid.MessagingServer if (p.Length > 0) { - LLUUID assetID = null; - + LLUUID assetID = null; + if (!LLUUID.TryParse(p[0], out assetID)) { m_log.InfoFormat( @@ -101,7 +101,7 @@ namespace OpenSim.Grid.MessagingServer public PostXMPPStreamHandler() : base("POST", "/presence") { - + } } -- cgit v1.1