diff options
author | Jeff Ames | 2008-08-18 00:39:10 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-18 00:39:10 +0000 |
commit | 6ef9d4da901a346c232458317cca6268da888e2e (patch) | |
tree | dd1d935b10f34f261839da9f9879c02322e8ede7 /OpenSim/Region/Communications/OGS1 | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.zip opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.gz opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.bz2 opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 10 |
2 files changed, 10 insertions, 10 deletions
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 | |||
139 | try | 139 | try |
140 | { | 140 | { |
141 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); | 141 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); |
142 | 142 | ||
143 | // The timeout should always be significantly larger than the timeout for the grid server to request | 143 | // The timeout should always be significantly larger than the timeout for the grid server to request |
144 | // the initial status of the region before confirming registration. | 144 | // the initial status of the region before confirming registration. |
145 | GridResp = GridReq.Send(serversInfo.GridURL, 90000); | 145 | GridResp = GridReq.Send(serversInfo.GridURL, 90000); |
@@ -630,7 +630,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
630 | } | 630 | } |
631 | 631 | ||
632 | XmlRpcResponse resp = new XmlRpcResponse(); | 632 | XmlRpcResponse resp = new XmlRpcResponse(); |
633 | 633 | ||
634 | if (banned) | 634 | if (banned) |
635 | { | 635 | { |
636 | m_log.InfoFormat("[OGS1 GRID SERVICES]: Denying access for user {0} {1} because user is banned",agentData.firstname,agentData.lastname); | 636 | 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 | |||
645 | m_log.Debug("[CONNECTION DEBUGGING]: Triggering welcome for " + agentData.AgentID.ToString() + " into " + regionHandle.ToString()); | 645 | m_log.Debug("[CONNECTION DEBUGGING]: Triggering welcome for " + agentData.AgentID.ToString() + " into " + regionHandle.ToString()); |
646 | m_localBackend.TriggerExpectUser(regionHandle, agentData); | 646 | m_localBackend.TriggerExpectUser(regionHandle, agentData); |
647 | m_log.Info("[OGS1 GRID SERVICES]: Welcoming new user..."); | 647 | m_log.Info("[OGS1 GRID SERVICES]: Welcoming new user..."); |
648 | Hashtable respdata = new Hashtable(); | 648 | Hashtable respdata = new Hashtable(); |
649 | respdata["success"] = "TRUE"; | 649 | respdata["success"] = "TRUE"; |
650 | resp.Value = respdata; | 650 | resp.Value = respdata; |
651 | 651 | ||
@@ -1638,10 +1638,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1638 | hash["region_handle"] = regionHandle.ToString(); | 1638 | hash["region_handle"] = regionHandle.ToString(); |
1639 | hash["x"] = x.ToString(); | 1639 | hash["x"] = x.ToString(); |
1640 | hash["y"] = y.ToString(); | 1640 | hash["y"] = y.ToString(); |
1641 | 1641 | ||
1642 | IList paramList = new ArrayList(); | 1642 | IList paramList = new ArrayList(); |
1643 | paramList.Add(hash); | 1643 | paramList.Add(hash); |
1644 | 1644 | ||
1645 | // this might be cached, as we probably requested it just a moment ago... | 1645 | // this might be cached, as we probably requested it just a moment ago... |
1646 | RegionInfo info = RequestNeighbourInfo(regionHandle); | 1646 | RegionInfo info = RequestNeighbourInfo(regionHandle); |
1647 | 1647 | ||
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 | |||
252 | IList parameters = new ArrayList(); | 252 | IList parameters = new ArrayList(); |
253 | parameters.Add(param); | 253 | parameters.Add(param); |
254 | XmlRpcRequest req = new XmlRpcRequest("logout_of_simulator", parameters); | 254 | XmlRpcRequest req = new XmlRpcRequest("logout_of_simulator", parameters); |
255 | 255 | ||
256 | try | 256 | try |
257 | { | 257 | { |
258 | req.Send(m_parent.NetworkServersInfo.UserURL, 3000); | 258 | req.Send(m_parent.NetworkServersInfo.UserURL, 3000); |
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
262 | m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff"); | 262 | m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff"); |
263 | } | 263 | } |
264 | } | 264 | } |
265 | 265 | ||
266 | public UserProfileData GetUserProfile(string firstName, string lastName) | 266 | public UserProfileData GetUserProfile(string firstName, string lastName) |
267 | { | 267 | { |
268 | return GetUserProfile(firstName + " " + lastName); | 268 | return GetUserProfile(firstName + " " + lastName); |
@@ -711,7 +711,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
711 | public AvatarAppearance GetUserAppearance(LLUUID user) | 711 | public AvatarAppearance GetUserAppearance(LLUUID user) |
712 | { | 712 | { |
713 | AvatarAppearance appearance = null; | 713 | AvatarAppearance appearance = null; |
714 | 714 | ||
715 | try | 715 | try |
716 | { | 716 | { |
717 | Hashtable param = new Hashtable(); | 717 | Hashtable param = new Hashtable(); |
@@ -722,14 +722,14 @@ namespace OpenSim.Region.Communications.OGS1 | |||
722 | XmlRpcRequest req = new XmlRpcRequest("get_avatar_appearance", parameters); | 722 | XmlRpcRequest req = new XmlRpcRequest("get_avatar_appearance", parameters); |
723 | XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000); | 723 | XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000); |
724 | Hashtable respData = (Hashtable) resp.Value; | 724 | Hashtable respData = (Hashtable) resp.Value; |
725 | 725 | ||
726 | return ConvertXMLRPCDataToAvatarAppearance(respData); | 726 | return ConvertXMLRPCDataToAvatarAppearance(respData); |
727 | } | 727 | } |
728 | catch (WebException e) | 728 | catch (WebException e) |
729 | { | 729 | { |
730 | m_log.ErrorFormat("[OGS1 USER SERVICES]: Network problems when trying to fetch appearance for avatar {0}, {1}", user, e.Message); | 730 | m_log.ErrorFormat("[OGS1 USER SERVICES]: Network problems when trying to fetch appearance for avatar {0}, {1}", user, e.Message); |
731 | } | 731 | } |
732 | 732 | ||
733 | return appearance; | 733 | return appearance; |
734 | } | 734 | } |
735 | 735 | ||