* Breaking all the code, breaking all the code..!

* Made a bunch more members static, removed some dead code, general cleaning.
This commit is contained in:
Adam Frisby
2008-05-01 16:23:53 +00:00
parent 5231903778
commit 01f31fd933
27 changed files with 61 additions and 72 deletions

View File

@@ -78,8 +78,6 @@ namespace OpenSim.Grid.GridServer
m_log.Info("[DATA]: Added IGridData Interface");
}
typeInterface = null;
// Logs go here
typeInterface = pluginType.GetInterface("ILogData", true);
@@ -91,12 +89,8 @@ namespace OpenSim.Grid.GridServer
_logplugins.Add(plug.getName(), plug);
m_log.Info("[DATA]: Added ILogData Interface");
}
typeInterface = null;
}
}
pluginAssembly = null;
}
/// <summary>
@@ -274,7 +268,7 @@ namespace OpenSim.Grid.GridServer
sim.regionSendKey == Config.SimRecvKey);
}
private XmlRpcResponse ErrorResponse(string error)
private static XmlRpcResponse ErrorResponse(string error)
{
XmlRpcResponse errorResponse = new XmlRpcResponse();
Hashtable errorResponseData = new Hashtable();
@@ -609,7 +603,7 @@ namespace OpenSim.Grid.GridServer
response.Value = responseData;
//RegionProfileData TheSim = null;
string uuid = String.Empty; ;
string uuid;
Hashtable requestData = (Hashtable)request.Params[0];
if (requestData.ContainsKey("UUID"))
@@ -744,8 +738,7 @@ namespace OpenSim.Grid.GridServer
response.Value = responseData;
IList simProfileList = new ArrayList();
bool fastMode = false; // MySQL Only
fastMode = (Config.DatabaseProvider == "OpenSim.Data.MySQL.dll");
bool fastMode = (Config.DatabaseProvider == "OpenSim.Data.MySQL.dll");
if (fastMode)
{

View File

@@ -71,12 +71,8 @@ namespace OpenSim.Grid.InventoryServer
"Invenstorage: Added IInventoryData Interface");
break;
}
typeInterface = null;
}
}
pluginAssembly = null;
}
protected static SerializableInventory loadInventoryFromXmlFile(string fileName)

View File

@@ -80,14 +80,14 @@ namespace OpenSim.Grid.ScriptServer
Console.ReadLine();
}
private void RPC_ReceiveCommand(int ID, string Command, object[] p)
private static void RPC_ReceiveCommand(int ID, string Command, object[] p)
{
m_log.Info("[SERVER]: Received command: '" + Command + "'");
if (p != null)
{
for (int i = 0; i < p.Length; i++)
{
m_log.Info("[SERVER]: Param " + i + ": " + p[i].ToString());
m_log.Info("[SERVER]: Param " + i + ": " + p[i]);
}
}

View File

@@ -209,7 +209,7 @@ namespace OpenSim.Grid.UserServer
XmlRpcRequest GridReq = new XmlRpcRequest("logout_of_simulator", SendParams);
try
{
XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000);
GridReq.Send(serv.URI, 6000);
}
catch (WebException)
{
@@ -243,7 +243,7 @@ namespace OpenSim.Grid.UserServer
XmlRpcRequest GridReq = new XmlRpcRequest("login_to_simulator", SendParams);
try
{
XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000);
GridReq.Send(serv.URI, 6000);
m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login");
}
catch (WebException)