From 01f31fd933bbaec246d2fef5756b7d83be7980e0 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 1 May 2008 16:23:53 +0000
Subject: * Breaking all the code, breaking all the code..! * Made a bunch more
 members static, removed some dead code, general cleaning.

---
 OpenSim/Grid/GridServer/GridManager.cs             | 13 +++----------
 OpenSim/Grid/InventoryServer/InventoryManager.cs   |  4 ----
 OpenSim/Grid/ScriptServer/ScriptServerMain.cs      |  4 ++--
 OpenSim/Grid/UserServer/MessageServersConnector.cs |  4 ++--
 4 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'OpenSim/Grid')

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index ee2f129..7eb9c34 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -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)
             {
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index 1d4a4e3..5c65317 100644
--- a/OpenSim/Grid/InventoryServer/InventoryManager.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
@@ -71,12 +71,8 @@ namespace OpenSim.Grid.InventoryServer
                                                  "Invenstorage: Added IInventoryData Interface");
                         break;
                     }
-
-                    typeInterface = null;
                 }
             }
-
-            pluginAssembly = null;
         }
 
         protected static SerializableInventory loadInventoryFromXmlFile(string fileName)
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 729d262..528b51c 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -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]);
                 }
             }
 
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 22505cb..28f5c4c 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -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)
-- 
cgit v1.1