aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorAdam Frisby2008-05-01 16:23:53 +0000
committerAdam Frisby2008-05-01 16:23:53 +0000
commit01f31fd933bbaec246d2fef5756b7d83be7980e0 (patch)
tree45ce7727e83238bf492924bea3ff5f0b6c82acbc /OpenSim/Grid
parent* In ur code. Making it static. (diff)
downloadopensim-SC_OLD-01f31fd933bbaec246d2fef5756b7d83be7980e0.zip
opensim-SC_OLD-01f31fd933bbaec246d2fef5756b7d83be7980e0.tar.gz
opensim-SC_OLD-01f31fd933bbaec246d2fef5756b7d83be7980e0.tar.bz2
opensim-SC_OLD-01f31fd933bbaec246d2fef5756b7d83be7980e0.tar.xz
* Breaking all the code, breaking all the code..!
* Made a bunch more members static, removed some dead code, general cleaning.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs13
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs4
-rw-r--r--OpenSim/Grid/UserServer/MessageServersConnector.cs4
4 files changed, 7 insertions, 18 deletions
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
78 m_log.Info("[DATA]: Added IGridData Interface"); 78 m_log.Info("[DATA]: Added IGridData Interface");
79 } 79 }
80 80
81 typeInterface = null;
82
83 // Logs go here 81 // Logs go here
84 typeInterface = pluginType.GetInterface("ILogData", true); 82 typeInterface = pluginType.GetInterface("ILogData", true);
85 83
@@ -91,12 +89,8 @@ namespace OpenSim.Grid.GridServer
91 _logplugins.Add(plug.getName(), plug); 89 _logplugins.Add(plug.getName(), plug);
92 m_log.Info("[DATA]: Added ILogData Interface"); 90 m_log.Info("[DATA]: Added ILogData Interface");
93 } 91 }
94
95 typeInterface = null;
96 } 92 }
97 } 93 }
98
99 pluginAssembly = null;
100 } 94 }
101 95
102 /// <summary> 96 /// <summary>
@@ -274,7 +268,7 @@ namespace OpenSim.Grid.GridServer
274 sim.regionSendKey == Config.SimRecvKey); 268 sim.regionSendKey == Config.SimRecvKey);
275 } 269 }
276 270
277 private XmlRpcResponse ErrorResponse(string error) 271 private static XmlRpcResponse ErrorResponse(string error)
278 { 272 {
279 XmlRpcResponse errorResponse = new XmlRpcResponse(); 273 XmlRpcResponse errorResponse = new XmlRpcResponse();
280 Hashtable errorResponseData = new Hashtable(); 274 Hashtable errorResponseData = new Hashtable();
@@ -609,7 +603,7 @@ namespace OpenSim.Grid.GridServer
609 response.Value = responseData; 603 response.Value = responseData;
610 604
611 //RegionProfileData TheSim = null; 605 //RegionProfileData TheSim = null;
612 string uuid = String.Empty; ; 606 string uuid;
613 Hashtable requestData = (Hashtable)request.Params[0]; 607 Hashtable requestData = (Hashtable)request.Params[0];
614 608
615 if (requestData.ContainsKey("UUID")) 609 if (requestData.ContainsKey("UUID"))
@@ -744,8 +738,7 @@ namespace OpenSim.Grid.GridServer
744 response.Value = responseData; 738 response.Value = responseData;
745 IList simProfileList = new ArrayList(); 739 IList simProfileList = new ArrayList();
746 740
747 bool fastMode = false; // MySQL Only 741 bool fastMode = (Config.DatabaseProvider == "OpenSim.Data.MySQL.dll");
748 fastMode = (Config.DatabaseProvider == "OpenSim.Data.MySQL.dll");
749 742
750 if (fastMode) 743 if (fastMode)
751 { 744 {
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
71 "Invenstorage: Added IInventoryData Interface"); 71 "Invenstorage: Added IInventoryData Interface");
72 break; 72 break;
73 } 73 }
74
75 typeInterface = null;
76 } 74 }
77 } 75 }
78
79 pluginAssembly = null;
80 } 76 }
81 77
82 protected static SerializableInventory loadInventoryFromXmlFile(string fileName) 78 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
80 Console.ReadLine(); 80 Console.ReadLine();
81 } 81 }
82 82
83 private void RPC_ReceiveCommand(int ID, string Command, object[] p) 83 private static void RPC_ReceiveCommand(int ID, string Command, object[] p)
84 { 84 {
85 m_log.Info("[SERVER]: Received command: '" + Command + "'"); 85 m_log.Info("[SERVER]: Received command: '" + Command + "'");
86 if (p != null) 86 if (p != null)
87 { 87 {
88 for (int i = 0; i < p.Length; i++) 88 for (int i = 0; i < p.Length; i++)
89 { 89 {
90 m_log.Info("[SERVER]: Param " + i + ": " + p[i].ToString()); 90 m_log.Info("[SERVER]: Param " + i + ": " + p[i]);
91 } 91 }
92 } 92 }
93 93
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
209 XmlRpcRequest GridReq = new XmlRpcRequest("logout_of_simulator", SendParams); 209 XmlRpcRequest GridReq = new XmlRpcRequest("logout_of_simulator", SendParams);
210 try 210 try
211 { 211 {
212 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); 212 GridReq.Send(serv.URI, 6000);
213 } 213 }
214 catch (WebException) 214 catch (WebException)
215 { 215 {
@@ -243,7 +243,7 @@ namespace OpenSim.Grid.UserServer
243 XmlRpcRequest GridReq = new XmlRpcRequest("login_to_simulator", SendParams); 243 XmlRpcRequest GridReq = new XmlRpcRequest("login_to_simulator", SendParams);
244 try 244 try
245 { 245 {
246 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); 246 GridReq.Send(serv.URI, 6000);
247 m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login"); 247 m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login");
248 } 248 }
249 catch (WebException) 249 catch (WebException)