diff options
author | Adam Frisby | 2008-05-01 16:23:53 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 16:23:53 +0000 |
commit | 01f31fd933bbaec246d2fef5756b7d83be7980e0 (patch) | |
tree | 45ce7727e83238bf492924bea3ff5f0b6c82acbc /OpenSim/Grid/GridServer | |
parent | * In ur code. Making it static. (diff) | |
download | opensim-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/GridServer')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 13 |
1 files changed, 3 insertions, 10 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 | { |