From 3476dd56ea9a6b2e597d2a4e8abf679ac0778681 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sun, 14 Sep 2008 04:13:15 +0000
Subject: * Converted a number of methods within the login processes from
private to protected. * Made several methods virtual to allow derivative
overrides. * Minor cleanups.
---
OpenSim/Framework/Communications/LoginResponse.cs | 2 +-
OpenSim/Framework/Communications/LoginService.cs | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Framework/Communications')
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
#endregion
- public XmlRpcResponse ToXmlRpcResponse()
+ public virtual XmlRpcResponse ToXmlRpcResponse()
{
try
{
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
///
/// The XMLRPC request
/// The response to send
- public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
+ public virtual XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
{
// Temporary fix
m_loginMutex.WaitOne();
@@ -123,8 +123,8 @@ namespace OpenSim.Framework.Communications
UserProfileData userProfile;
LoginResponse logResponse = new LoginResponse();
- string firstname = String.Empty;
- string lastname = String.Empty;
+ string firstname;
+ string lastname;
if (GoodXML)
{
@@ -230,7 +230,7 @@ namespace OpenSim.Framework.Communications
try
{
UUID agentID = userProfile.ID;
- InventoryData inventData = null;
+ InventoryData inventData;
try
{
@@ -265,7 +265,7 @@ namespace OpenSim.Framework.Communications
logResponse.InventorySkeleton = AgentInventoryArray;
logResponse.InventoryLibrary = GetInventoryLibrary();
- logResponse.CircuitCode = (Int32)Util.RandomClass.Next();
+ logResponse.CircuitCode = Util.RandomClass.Next();
logResponse.Lastname = userProfile.SurName;
logResponse.Firstname = userProfile.FirstName;
logResponse.AgentID = agentID.ToString();
@@ -298,7 +298,7 @@ namespace OpenSim.Framework.Communications
}
catch (Exception e)
{
- m_log.Info("[LOGIN END]: XMLRPC Login failed, " + e.ToString());
+ m_log.Info("[LOGIN END]: XMLRPC Login failed, " + e);
}
}
--
cgit v1.1