diff options
Diffstat (limited to '')
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs index c2b8f26..94e4ed2 100644 --- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs +++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
40 | : base(serversInfo, libraryRootFolder) | 40 | : base(serversInfo, libraryRootFolder) |
41 | { | 41 | { |
42 | 42 | ||
43 | // This plugin arrangement could eventually be configurable rather than hardcoded here. | 43 | // This plugin arrangement could eventually be configurable rather than hardcoded here. |
44 | OGS1UserServices userServices = new OGS1UserServices(this); | 44 | OGS1UserServices userServices = new OGS1UserServices(this); |
45 | userServices.AddPlugin(new TemporaryUserProfilePlugin()); | 45 | userServices.AddPlugin(new TemporaryUserProfilePlugin()); |
46 | userServices.AddPlugin(new OGS1UserDataPlugin(this)); | 46 | userServices.AddPlugin(new OGS1UserDataPlugin(this)); |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs index 01d6ec8..2f9a45f 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs | |||
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
81 | public virtual void AddTemporaryUserProfile(UserProfileData userProfile) | 81 | public virtual void AddTemporaryUserProfile(UserProfileData userProfile) |
82 | { | 82 | { |
83 | // Not interested | 83 | // Not interested |
84 | } | 84 | } |
85 | 85 | ||
86 | public UserProfileData GetUserByUri(Uri uri) | 86 | public UserProfileData GetUserByUri(Uri uri) |
87 | { | 87 | { |
@@ -695,7 +695,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
695 | userData.Partner = UUID.Zero; | 695 | userData.Partner = UUID.Zero; |
696 | 696 | ||
697 | return userData; | 697 | return userData; |
698 | } | 698 | } |
699 | 699 | ||
700 | protected AvatarAppearance ConvertXMLRPCDataToAvatarAppearance(Hashtable data) | 700 | protected AvatarAppearance ConvertXMLRPCDataToAvatarAppearance(Hashtable data) |
701 | { | 701 | { |
@@ -766,6 +766,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
766 | } | 766 | } |
767 | 767 | ||
768 | return buddylist; | 768 | return buddylist; |
769 | } | 769 | } |
770 | } | 770 | } |
771 | } | 771 | } |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 51ba2e9..ed3526d 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -41,7 +41,7 @@ using OpenSim.Framework.Communications; | |||
41 | using OpenSim.Framework.Communications.Clients; | 41 | using OpenSim.Framework.Communications.Clients; |
42 | 42 | ||
43 | namespace OpenSim.Region.Communications.OGS1 | 43 | namespace OpenSim.Region.Communications.OGS1 |
44 | { | 44 | { |
45 | public class OGS1UserServices : UserManagerBase | 45 | public class OGS1UserServices : UserManagerBase |
46 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
94 | catch (WebException) | 94 | catch (WebException) |
95 | { | 95 | { |
96 | m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff"); | 96 | m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff"); |
97 | } | 97 | } |
98 | } | 98 | } |
99 | 99 | ||
100 | /// <summary> | 100 | /// <summary> |
@@ -150,10 +150,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
150 | IList parameters = new ArrayList(); | 150 | IList parameters = new ArrayList(); |
151 | parameters.Add(param); | 151 | parameters.Add(param); |
152 | XmlRpcRequest req = new XmlRpcRequest("authenticate_user_by_password", parameters); | 152 | XmlRpcRequest req = new XmlRpcRequest("authenticate_user_by_password", parameters); |
153 | XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000); | 153 | XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000); |
154 | 154 | ||
155 | // Temporary measure to deal with older services | 155 | // Temporary measure to deal with older services |
156 | if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD) | 156 | if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD) |
157 | { | 157 | { |
158 | throw new Exception( | 158 | throw new Exception( |
159 | String.Format( | 159 | String.Format( |
@@ -170,7 +170,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
170 | else | 170 | else |
171 | { | 171 | { |
172 | return false; | 172 | return false; |
173 | } | 173 | } |
174 | } | 174 | } |
175 | } | 175 | } |
176 | } \ No newline at end of file | 176 | } \ No newline at end of file |