diff options
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/LoginResponse.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs index f92d66f..435852d4 100644 --- a/OpenSim/Framework/Communications/LoginResponse.cs +++ b/OpenSim/Framework/Communications/LoginResponse.cs | |||
@@ -307,7 +307,7 @@ namespace OpenSim.Framework.Communications | |||
307 | 307 | ||
308 | #endregion | 308 | #endregion |
309 | 309 | ||
310 | public XmlRpcResponse ToXmlRpcResponse() | 310 | public virtual XmlRpcResponse ToXmlRpcResponse() |
311 | { | 311 | { |
312 | try | 312 | try |
313 | { | 313 | { |
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 26ae3c6..f4c43ef 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Communications | |||
103 | /// </summary> | 103 | /// </summary> |
104 | /// <param name="request">The XMLRPC request</param> | 104 | /// <param name="request">The XMLRPC request</param> |
105 | /// <returns>The response to send</returns> | 105 | /// <returns>The response to send</returns> |
106 | public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) | 106 | public virtual XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) |
107 | { | 107 | { |
108 | // Temporary fix | 108 | // Temporary fix |
109 | m_loginMutex.WaitOne(); | 109 | m_loginMutex.WaitOne(); |
@@ -123,8 +123,8 @@ namespace OpenSim.Framework.Communications | |||
123 | UserProfileData userProfile; | 123 | UserProfileData userProfile; |
124 | LoginResponse logResponse = new LoginResponse(); | 124 | LoginResponse logResponse = new LoginResponse(); |
125 | 125 | ||
126 | string firstname = String.Empty; | 126 | string firstname; |
127 | string lastname = String.Empty; | 127 | string lastname; |
128 | 128 | ||
129 | if (GoodXML) | 129 | if (GoodXML) |
130 | { | 130 | { |
@@ -230,7 +230,7 @@ namespace OpenSim.Framework.Communications | |||
230 | try | 230 | try |
231 | { | 231 | { |
232 | UUID agentID = userProfile.ID; | 232 | UUID agentID = userProfile.ID; |
233 | InventoryData inventData = null; | 233 | InventoryData inventData; |
234 | 234 | ||
235 | try | 235 | try |
236 | { | 236 | { |
@@ -265,7 +265,7 @@ namespace OpenSim.Framework.Communications | |||
265 | logResponse.InventorySkeleton = AgentInventoryArray; | 265 | logResponse.InventorySkeleton = AgentInventoryArray; |
266 | logResponse.InventoryLibrary = GetInventoryLibrary(); | 266 | logResponse.InventoryLibrary = GetInventoryLibrary(); |
267 | 267 | ||
268 | logResponse.CircuitCode = (Int32)Util.RandomClass.Next(); | 268 | logResponse.CircuitCode = Util.RandomClass.Next(); |
269 | logResponse.Lastname = userProfile.SurName; | 269 | logResponse.Lastname = userProfile.SurName; |
270 | logResponse.Firstname = userProfile.FirstName; | 270 | logResponse.Firstname = userProfile.FirstName; |
271 | logResponse.AgentID = agentID.ToString(); | 271 | logResponse.AgentID = agentID.ToString(); |
@@ -298,7 +298,7 @@ namespace OpenSim.Framework.Communications | |||
298 | } | 298 | } |
299 | catch (Exception e) | 299 | catch (Exception e) |
300 | { | 300 | { |
301 | m_log.Info("[LOGIN END]: XMLRPC Login failed, " + e.ToString()); | 301 | m_log.Info("[LOGIN END]: XMLRPC Login failed, " + e); |
302 | } | 302 | } |
303 | } | 303 | } |
304 | 304 | ||