diff options
author | Mike Mazur | 2009-01-28 01:55:45 +0000 |
---|---|---|
committer | Mike Mazur | 2009-01-28 01:55:45 +0000 |
commit | 7aa216d574897005c6d54e02e3e968e42d52f502 (patch) | |
tree | 8404c3bc02ca45895a89f7907a34c4cb04854d39 | |
parent | delete some commented out junk code notes (diff) | |
download | opensim-SC_OLD-7aa216d574897005c6d54e02e3e968e42d52f502.zip opensim-SC_OLD-7aa216d574897005c6d54e02e3e968e42d52f502.tar.gz opensim-SC_OLD-7aa216d574897005c6d54e02e3e968e42d52f502.tar.bz2 opensim-SC_OLD-7aa216d574897005c6d54e02e3e968e42d52f502.tar.xz |
Slight cleanup of docs, removing trailing whitespace.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 11 | ||||
-rw-r--r-- | OpenSim/Framework/PluginLoader.cs | 12 |
2 files changed, 11 insertions, 12 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index d4a7980..1e66618 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Data.MySQL | |||
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | private MySQLManager _dbConnection; | 47 | private MySQLManager _dbConnection; |
48 | private long TicksToEpoch; | 48 | private long TicksToEpoch; |
49 | 49 | ||
50 | #region IPlugin Members | 50 | #region IPlugin Members |
51 | 51 | ||
@@ -93,9 +93,8 @@ namespace OpenSim.Data.MySQL | |||
93 | /// </list> | 93 | /// </list> |
94 | /// </para> | 94 | /// </para> |
95 | /// </summary> | 95 | /// </summary> |
96 | /// <param name="connect">connect string</param> | 96 | /// <remarks>DEPRECATED and shouldn't be used</remarks> |
97 | /// <remarks>Probably DEPRECATED and shouldn't be used</remarks> | 97 | public override void Initialise() |
98 | override public void Initialise() | ||
99 | { | 98 | { |
100 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); | 99 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); |
101 | string hostname = GridDataMySqlFile.ParseFileReadValue("hostname"); | 100 | string hostname = GridDataMySqlFile.ParseFileReadValue("hostname"); |
@@ -109,7 +108,7 @@ namespace OpenSim.Data.MySQL | |||
109 | 108 | ||
110 | } | 109 | } |
111 | 110 | ||
112 | override public void Dispose() { } | 111 | public override void Dispose() { } |
113 | 112 | ||
114 | #region IAssetProviderPlugin Members | 113 | #region IAssetProviderPlugin Members |
115 | 114 | ||
@@ -257,7 +256,7 @@ namespace OpenSim.Data.MySQL | |||
257 | _dbConnection.Reconnect(); | 256 | _dbConnection.Reconnect(); |
258 | } | 257 | } |
259 | } | 258 | } |
260 | 259 | ||
261 | } | 260 | } |
262 | 261 | ||
263 | /// <summary> | 262 | /// <summary> |
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs index baf9c57..15e0b9f 100644 --- a/OpenSim/Framework/PluginLoader.cs +++ b/OpenSim/Framework/PluginLoader.cs | |||
@@ -182,7 +182,7 @@ namespace OpenSim.Framework | |||
182 | T plugin = (T)node.CreateInstance(); | 182 | T plugin = (T)node.CreateInstance(); |
183 | loadedPlugins.Add(plugin); | 183 | loadedPlugins.Add(plugin); |
184 | } | 184 | } |
185 | 185 | ||
186 | // We do Initialise() in a second loop after CreateInstance | 186 | // We do Initialise() in a second loop after CreateInstance |
187 | // So that modules who need init before others can do it | 187 | // So that modules who need init before others can do it |
188 | // Example: Script Engine Component System needs to load its components before RegionLoader starts | 188 | // Example: Script Engine Component System needs to load its components before RegionLoader starts |
@@ -349,7 +349,7 @@ namespace OpenSim.Framework | |||
349 | } | 349 | } |
350 | 350 | ||
351 | /// <summary> | 351 | /// <summary> |
352 | /// Filters out which plugin to load based on its the plugin name or names given. Plugin names are contained in | 352 | /// Filters out which plugin to load based on its the plugin name or names given. Plugin names are contained in |
353 | /// their addin.xml | 353 | /// their addin.xml |
354 | /// </summary> | 354 | /// </summary> |
355 | public class PluginProviderFilter : IPluginFilter | 355 | public class PluginProviderFilter : IPluginFilter |
@@ -365,7 +365,7 @@ namespace OpenSim.Framework | |||
365 | public PluginProviderFilter(string p) | 365 | public PluginProviderFilter(string p) |
366 | { | 366 | { |
367 | m_filters = p.Split(','); | 367 | m_filters = p.Split(','); |
368 | 368 | ||
369 | for (int i = 0; i < m_filters.Length; i++) | 369 | for (int i = 0; i < m_filters.Length; i++) |
370 | { | 370 | { |
371 | m_filters[i] = m_filters[i].Trim(); | 371 | m_filters[i] = m_filters[i].Trim(); |
@@ -379,14 +379,14 @@ namespace OpenSim.Framework | |||
379 | /// <returns>true if the plugin's name matched one of the filters, false otherwise.</returns> | 379 | /// <returns>true if the plugin's name matched one of the filters, false otherwise.</returns> |
380 | public bool Apply (PluginExtensionNode plugin) | 380 | public bool Apply (PluginExtensionNode plugin) |
381 | { | 381 | { |
382 | for (int i = 0; i < m_filters.Length; i++) | 382 | for (int i = 0; i < m_filters.Length; i++) |
383 | { | 383 | { |
384 | if (m_filters[i] == plugin.Provider) | 384 | if (m_filters[i] == plugin.Provider) |
385 | { | 385 | { |
386 | return true; | 386 | return true; |
387 | } | 387 | } |
388 | } | 388 | } |
389 | 389 | ||
390 | return false; | 390 | return false; |
391 | } | 391 | } |
392 | } | 392 | } |