ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Converted a number of methods within the login processes from private to protected.

Browse Source 
* Made several methods virtual to allow derivative overrides.
* Minor cleanups.
This commit is contained in:
Adam Frisby
2008-09-14 04:13:15 +00:00
parent 1d5e870ee2
commit 3476dd56ea
5 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/LoginResponse.cs
View File

@@ -307,7 +307,7 @@ namespace OpenSim.Framework.Communications
#endregion
public XmlRpcResponse ToXmlRpcResponse()
public virtual XmlRpcResponse ToXmlRpcResponse()
{
try
{

12
OpenSim/Framework/Communications/LoginService.cs
View File

@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Communications
/// </summary>
/// <param name="request">The XMLRPC request</param>
/// <returns>The response to send</returns>
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);
}
}

10
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -104,15 +104,9 @@ namespace OpenSim.Framework.Servers
{
lock (m_rpcHandlers)
{
if (!m_rpcHandlers.ContainsKey(method))
{
m_rpcHandlers.Add(method, handler);
return true;
}
m_rpcHandlers[method] = handler;
return true;
}
//must already have a handler for that path so return false
return false;
}
public bool AddHTTPHandler(string method, GenericHTTPMethod handler)