aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorJeff Ames2008-06-04 09:59:27 +0000
committerJeff Ames2008-06-04 09:59:27 +0000
commit4ec4e16c809cf86a63b736d2b7b6ad7291595a5f (patch)
treecfa896ef9057228171e2ee39c4807060101ba90b /OpenSim/Region/Communications
parent* If a ThreadAbortException reaches AuthUser() then let it pass through unmol... (diff)
downloadopensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.zip
opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.gz
opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.bz2
opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.xz
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs8
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs12
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 0daabc5..85ab99c 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -624,14 +624,14 @@ namespace OpenSim.Region.Communications.OGS1
624 LLUUID agentID = LLUUID.Zero; 624 LLUUID agentID = LLUUID.Zero;
625 LLUUID RegionSecret = LLUUID.Zero; 625 LLUUID RegionSecret = LLUUID.Zero;
626 Helpers.TryParse((string)requestData["agent_id"], out agentID); 626 Helpers.TryParse((string)requestData["agent_id"], out agentID);
627 Helpers.TryParse((string)requestData["region_secret"], out RegionSecret); 627 Helpers.TryParse((string)requestData["region_secret"], out RegionSecret);
628 628
629 ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]); 629 ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
630 630
631 631
632 m_localBackend.TriggerLogOffUser(regionHandle, agentID, RegionSecret,message); 632 m_localBackend.TriggerLogOffUser(regionHandle, agentID, RegionSecret,message);
633 633
634 634
635 635
636 return new XmlRpcResponse(); 636 return new XmlRpcResponse();
637 } 637 }
@@ -647,7 +647,7 @@ namespace OpenSim.Region.Communications.OGS1
647 try 647 try
648 { 648 {
649 ch = new TcpChannel((int)NetworkServersInfo.RemotingListenerPort); 649 ch = new TcpChannel((int)NetworkServersInfo.RemotingListenerPort);
650 ChannelServices.RegisterChannel(ch, false); // Disabled security as Mono doesnt support this. 650 ChannelServices.RegisterChannel(ch, false); // Disabled security as Mono doesn't support this.
651 } 651 }
652 catch (Exception ex) 652 catch (Exception ex)
653 { 653 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index d486c40..a31570e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -85,8 +85,8 @@ namespace OpenSim.Region.Communications.OGS1
85 (float) Convert.ToDecimal((string) data["home_look_z"])); 85 (float) Convert.ToDecimal((string) data["home_look_z"]));
86 86
87 return userData; 87 return userData;
88 } 88 }
89 89
90 /// <summary> 90 /// <summary>
91 /// Get a user agent from the user server 91 /// Get a user agent from the user server
92 /// </summary> 92 /// </summary>
@@ -126,7 +126,7 @@ namespace OpenSim.Region.Communications.OGS1
126 { 126 {
127 userAgent.AgentOnline = false; 127 userAgent.AgentOnline = false;
128 } 128 }
129 129
130 return userAgent; 130 return userAgent;
131 } 131 }
132 catch (Exception e) 132 catch (Exception e)
@@ -259,7 +259,7 @@ namespace OpenSim.Region.Communications.OGS1
259 XmlRpcRequest req = new XmlRpcRequest("update_user_current_region", parameters); 259 XmlRpcRequest req = new XmlRpcRequest("update_user_current_region", parameters);
260 260
261 XmlRpcResponse resp; 261 XmlRpcResponse resp;
262 262
263 try 263 try
264 { 264 {
265 resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000); 265 resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
@@ -278,8 +278,8 @@ namespace OpenSim.Region.Communications.OGS1
278 return; 278 return;
279 } 279 }
280 } 280 }
281 281
282 if( resp == null ) 282 if (resp == null)
283 { 283 {
284 m_log.Warn("[OSG1 USER SERVICES]: Got no response, Grid server may not be updated."); 284 m_log.Warn("[OSG1 USER SERVICES]: Got no response, Grid server may not be updated.");
285 return; 285 return;