diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/GridServer.Config/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer.Config/DbGridConfig.cs | 55 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 41 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Main.cs | 14 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs | 2 |
5 files changed, 51 insertions, 63 deletions
diff --git a/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs b/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs index c9701d6..39c9e8f 100644 --- a/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs +++ b/OpenSim/Grid/GridServer.Config/AssemblyInfo.cs | |||
@@ -26,9 +26,7 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using System.Runtime.CompilerServices; | ||
30 | using System.Runtime.InteropServices; | 29 | using System.Runtime.InteropServices; |
31 | |||
32 | // Information about this assembly is defined by the following | 30 | // Information about this assembly is defined by the following |
33 | // attributes. | 31 | // attributes. |
34 | // | 32 | // |
diff --git a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs index 2218004..4acf81d 100644 --- a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs +++ b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs | |||
@@ -26,10 +26,9 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using Db4objects.Db4o; |
30 | using OpenSim.Framework.Console; | 30 | using OpenSim.Framework.Console; |
31 | using OpenSim.Framework.Interfaces; | 31 | using OpenSim.Framework.Interfaces; |
32 | using Db4objects.Db4o; | ||
33 | 32 | ||
34 | namespace OpenGrid.Config.GridConfigDb4o | 33 | namespace OpenGrid.Config.GridConfigDb4o |
35 | { | 34 | { |
@@ -44,7 +43,7 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
44 | /// <returns>A grid configuration object</returns> | 43 | /// <returns>A grid configuration object</returns> |
45 | public GridConfig GetConfigObject() | 44 | public GridConfig GetConfigObject() |
46 | { | 45 | { |
47 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll"); | 46 | MainLog.Instance.Verbose("Loading Db40Config dll"); |
48 | return ( new DbGridConfig()); | 47 | return ( new DbGridConfig()); |
49 | } | 48 | } |
50 | } | 49 | } |
@@ -63,24 +62,24 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
63 | /// User configuration for the Grid Config interfaces | 62 | /// User configuration for the Grid Config interfaces |
64 | /// </summary> | 63 | /// </summary> |
65 | public void LoadDefaults() { | 64 | public void LoadDefaults() { |
66 | OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); | 65 | MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); |
67 | 66 | ||
68 | // About the grid options | 67 | // About the grid options |
69 | this.GridOwner = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid owner", "OGS development team"); | 68 | this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team"); |
70 | 69 | ||
71 | // Asset Options | 70 | // Asset Options |
72 | this.DefaultAssetServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/"); | 71 | this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:8003/"); |
73 | this.AssetSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to asset server","null"); | 72 | this.AssetSendKey = MainLog.Instance.CmdPrompt("Key to send to asset server","null"); |
74 | this.AssetRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from asset server","null"); | 73 | this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null"); |
75 | 74 | ||
76 | // User Server Options | 75 | // User Server Options |
77 | this.DefaultUserServer = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/"); | 76 | this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:8002/"); |
78 | this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server","null"); | 77 | this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null"); |
79 | this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server","null"); | 78 | this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null"); |
80 | 79 | ||
81 | // Region Server Options | 80 | // Region Server Options |
82 | this.SimSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to sims","null"); | 81 | this.SimSendKey = MainLog.Instance.CmdPrompt("Key to send to sims","null"); |
83 | this.SimRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from sims","null"); | 82 | this.SimRecvKey = MainLog.Instance.CmdPrompt("Key to expect from sims","null"); |
84 | } | 83 | } |
85 | 84 | ||
86 | /// <summary> | 85 | /// <summary> |
@@ -95,7 +94,7 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
95 | IObjectSet result = db.Get(typeof(DbGridConfig)); | 94 | IObjectSet result = db.Get(typeof(DbGridConfig)); |
96 | // Found? | 95 | // Found? |
97 | if(result.Count==1) { | 96 | if(result.Count==1) { |
98 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading"); | 97 | MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading"); |
99 | foreach (DbGridConfig cfg in result) { | 98 | foreach (DbGridConfig cfg in result) { |
100 | // Import each setting into this class | 99 | // Import each setting into this class |
101 | // Grid Settings | 100 | // Grid Settings |
@@ -114,40 +113,40 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
114 | } | 113 | } |
115 | // Create a new configuration object from this class | 114 | // Create a new configuration object from this class |
116 | } else { | 115 | } else { |
117 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); | 116 | MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); |
118 | 117 | ||
119 | // Load default settings into this class | 118 | // Load default settings into this class |
120 | LoadDefaults(); | 119 | LoadDefaults(); |
121 | 120 | ||
122 | // Saves to the database file... | 121 | // Saves to the database file... |
123 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Writing out default settings to local database"); | 122 | MainLog.Instance.Verbose( "Writing out default settings to local database"); |
124 | db.Set(this); | 123 | db.Set(this); |
125 | 124 | ||
126 | // Closes file locks | 125 | // Closes file locks |
127 | db.Close(); | 126 | db.Close(); |
128 | } | 127 | } |
129 | } catch(Exception e) { | 128 | } catch(Exception e) { |
130 | OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); | 129 | MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); |
131 | OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); | 130 | MainLog.Instance.Warn(e.ToString()); |
132 | } | 131 | } |
133 | 132 | ||
134 | // Grid Settings | 133 | // Grid Settings |
135 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid settings loaded:"); | 134 | MainLog.Instance.Verbose("Grid settings loaded:"); |
136 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid owner: " + this.GridOwner); | 135 | MainLog.Instance.Verbose("Grid owner: " + this.GridOwner); |
137 | 136 | ||
138 | // Asset Settings | 137 | // Asset Settings |
139 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer); | 138 | MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer); |
140 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey); | 139 | MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey); |
141 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey); | 140 | MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey); |
142 | 141 | ||
143 | // User Settings | 142 | // User Settings |
144 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer); | 143 | MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer); |
145 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey); | 144 | MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey); |
146 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey); | 145 | MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey); |
147 | 146 | ||
148 | // Region Settings | 147 | // Region Settings |
149 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey); | 148 | MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey); |
150 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey); | 149 | MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey); |
151 | } | 150 | } |
152 | 151 | ||
153 | /// <summary> | 152 | /// <summary> |
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index e562721..7986591 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -28,15 +28,14 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | ||
32 | using System.Reflection; | 31 | using System.Reflection; |
33 | using OpenSim.Framework.Data; | 32 | using System.Xml; |
34 | using OpenSim.Framework.Utilities; | ||
35 | using OpenSim.Framework.Console; | ||
36 | using OpenSim.Framework.Sims; | ||
37 | using libsecondlife; | 33 | using libsecondlife; |
38 | using Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
39 | using System.Xml; | 35 | using OpenSim.Framework.Console; |
36 | using OpenSim.Framework.Data; | ||
37 | using OpenSim.Framework.Interfaces; | ||
38 | using OpenSim.Framework.Utilities; | ||
40 | 39 | ||
41 | namespace OpenSim.Grid.GridServer | 40 | namespace OpenSim.Grid.GridServer |
42 | { | 41 | { |
@@ -45,7 +44,7 @@ namespace OpenSim.Grid.GridServer | |||
45 | Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>(); | 44 | Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>(); |
46 | Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>(); | 45 | Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>(); |
47 | 46 | ||
48 | public OpenSim.Framework.Interfaces.GridConfig config; | 47 | public GridConfig config; |
49 | 48 | ||
50 | /// <summary> | 49 | /// <summary> |
51 | /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded. | 50 | /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded. |
@@ -53,10 +52,10 @@ namespace OpenSim.Grid.GridServer | |||
53 | /// <param name="FileName">The filename to the grid server plugin DLL</param> | 52 | /// <param name="FileName">The filename to the grid server plugin DLL</param> |
54 | public void AddPlugin(string FileName) | 53 | public void AddPlugin(string FileName) |
55 | { | 54 | { |
56 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Attempting to load " + FileName); | 55 | MainLog.Instance.Verbose("Storage: Attempting to load " + FileName); |
57 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); | 56 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); |
58 | 57 | ||
59 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); | 58 | MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); |
60 | foreach (Type pluginType in pluginAssembly.GetTypes()) | 59 | foreach (Type pluginType in pluginAssembly.GetTypes()) |
61 | { | 60 | { |
62 | if (!pluginType.IsAbstract) | 61 | if (!pluginType.IsAbstract) |
@@ -69,7 +68,7 @@ namespace OpenSim.Grid.GridServer | |||
69 | IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 68 | IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
70 | plug.Initialise(); | 69 | plug.Initialise(); |
71 | this._plugins.Add(plug.getName(), plug); | 70 | this._plugins.Add(plug.getName(), plug); |
72 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Added IGridData Interface"); | 71 | MainLog.Instance.Verbose("Storage: Added IGridData Interface"); |
73 | } | 72 | } |
74 | 73 | ||
75 | typeInterface = null; | 74 | typeInterface = null; |
@@ -82,7 +81,7 @@ namespace OpenSim.Grid.GridServer | |||
82 | ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 81 | ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
83 | plug.Initialise(); | 82 | plug.Initialise(); |
84 | this._logplugins.Add(plug.getName(), plug); | 83 | this._logplugins.Add(plug.getName(), plug); |
85 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Storage: Added ILogData Interface"); | 84 | MainLog.Instance.Verbose( "Storage: Added ILogData Interface"); |
86 | } | 85 | } |
87 | 86 | ||
88 | typeInterface = null; | 87 | typeInterface = null; |
@@ -110,7 +109,7 @@ namespace OpenSim.Grid.GridServer | |||
110 | } | 109 | } |
111 | catch (Exception) | 110 | catch (Exception) |
112 | { | 111 | { |
113 | OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key); | 112 | MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key); |
114 | } | 113 | } |
115 | } | 114 | } |
116 | } | 115 | } |
@@ -120,7 +119,7 @@ namespace OpenSim.Grid.GridServer | |||
120 | /// </summary> | 119 | /// </summary> |
121 | /// <param name="uuid">A UUID key of the region to return</param> | 120 | /// <param name="uuid">A UUID key of the region to return</param> |
122 | /// <returns>A SimProfileData for the region</returns> | 121 | /// <returns>A SimProfileData for the region</returns> |
123 | public SimProfileData getRegion(libsecondlife.LLUUID uuid) | 122 | public SimProfileData getRegion(LLUUID uuid) |
124 | { | 123 | { |
125 | foreach(KeyValuePair<string,IGridData> kvp in _plugins) { | 124 | foreach(KeyValuePair<string,IGridData> kvp in _plugins) { |
126 | try | 125 | try |
@@ -129,7 +128,7 @@ namespace OpenSim.Grid.GridServer | |||
129 | } | 128 | } |
130 | catch (Exception) | 129 | catch (Exception) |
131 | { | 130 | { |
132 | OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); | 131 | MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); |
133 | } | 132 | } |
134 | } | 133 | } |
135 | return null; | 134 | return null; |
@@ -150,7 +149,7 @@ namespace OpenSim.Grid.GridServer | |||
150 | } | 149 | } |
151 | catch | 150 | catch |
152 | { | 151 | { |
153 | OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); | 152 | MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); |
154 | } | 153 | } |
155 | } | 154 | } |
156 | return null; | 155 | return null; |
@@ -174,7 +173,7 @@ namespace OpenSim.Grid.GridServer | |||
174 | } | 173 | } |
175 | catch | 174 | catch |
176 | { | 175 | { |
177 | OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key); | 176 | MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key); |
178 | } | 177 | } |
179 | } | 178 | } |
180 | 179 | ||
@@ -370,7 +369,7 @@ namespace OpenSim.Grid.GridServer | |||
370 | 369 | ||
371 | simProfileList.Add(simProfileBlock); | 370 | simProfileList.Add(simProfileBlock); |
372 | } | 371 | } |
373 | OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); | 372 | MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); |
374 | } | 373 | } |
375 | else | 374 | else |
376 | { | 375 | { |
@@ -403,7 +402,7 @@ namespace OpenSim.Grid.GridServer | |||
403 | } | 402 | } |
404 | } | 403 | } |
405 | } | 404 | } |
406 | OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); | 405 | MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); |
407 | } | 406 | } |
408 | 407 | ||
409 | responseData["sim-profiles"] = simProfileList; | 408 | responseData["sim-profiles"] = simProfileList; |
@@ -565,7 +564,7 @@ namespace OpenSim.Grid.GridServer | |||
565 | 564 | ||
566 | try | 565 | try |
567 | { | 566 | { |
568 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered."); | 567 | MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered."); |
569 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) | 568 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) |
570 | { | 569 | { |
571 | try | 570 | try |
@@ -575,7 +574,7 @@ namespace OpenSim.Grid.GridServer | |||
575 | if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null)) | 574 | if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null)) |
576 | { | 575 | { |
577 | kvp.Value.AddProfile(TheSim); | 576 | kvp.Value.AddProfile(TheSim); |
578 | OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")"); | 577 | MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")"); |
579 | logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); | 578 | logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); |
580 | } | 579 | } |
581 | else | 580 | else |
@@ -585,7 +584,7 @@ namespace OpenSim.Grid.GridServer | |||
585 | } | 584 | } |
586 | catch (Exception e) | 585 | catch (Exception e) |
587 | { | 586 | { |
588 | OpenSim.Framework.Console.MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); | 587 | MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); |
589 | } | 588 | } |
590 | } | 589 | } |
591 | return "OK"; | 590 | return "OK"; |
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs index 490f757..20c4905 100644 --- a/OpenSim/Grid/GridServer/Main.cs +++ b/OpenSim/Grid/GridServer/Main.cs | |||
@@ -27,20 +27,14 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.IO; | ||
31 | using System.Text; | ||
32 | using System.Timers; | ||
33 | using System.Net; | ||
34 | using System.Threading; | ||
35 | using System.Reflection; | 30 | using System.Reflection; |
36 | using libsecondlife; | 31 | using System.Threading; |
37 | using OpenSim.Framework.Manager; | 32 | using System.Timers; |
38 | using OpenSim.Framework; | ||
39 | using OpenSim.Framework.Sims; | ||
40 | using OpenSim.Framework.Console; | 33 | using OpenSim.Framework.Console; |
41 | using OpenSim.Framework.Interfaces; | 34 | using OpenSim.Framework.Interfaces; |
42 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
43 | using OpenSim.GenericConfig; | 36 | using OpenSim.GenericConfig; |
37 | using Timer=System.Timers.Timer; | ||
44 | 38 | ||
45 | namespace OpenSim.Grid.GridServer | 39 | namespace OpenSim.Grid.GridServer |
46 | { | 40 | { |
@@ -156,7 +150,7 @@ namespace OpenSim.Grid.GridServer | |||
156 | 150 | ||
157 | m_console.Verbose( "Main.cs:Startup() - Starting sim status checker"); | 151 | m_console.Verbose( "Main.cs:Startup() - Starting sim status checker"); |
158 | 152 | ||
159 | System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates. | 153 | Timer simCheckTimer = new Timer(3600000 * 3); // 3 Hours between updates. |
160 | simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); | 154 | simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); |
161 | simCheckTimer.Enabled = true; | 155 | simCheckTimer.Enabled = true; |
162 | } | 156 | } |
diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs index 303dddf..62a68a8 100644 --- a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs +++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs | |||
@@ -26,9 +26,7 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using System.Runtime.CompilerServices; | ||
30 | using System.Runtime.InteropServices; | 29 | using System.Runtime.InteropServices; |
31 | |||
32 | // General Information about an assembly is controlled through the following | 30 | // General Information about an assembly is controlled through the following |
33 | // set of attributes. Change these attribute values to modify the information | 31 | // set of attributes. Change these attribute values to modify the information |
34 | // associated with an assembly. | 32 | // associated with an assembly. |