diff options
author | Mike Mazur | 2009-02-16 02:27:43 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-16 02:27:43 +0000 |
commit | 5277fc64c07da92014e749be40aa837193a26495 (patch) | |
tree | 5351a96ac5d612560dc63d8c8585237d9dc80d27 /OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs | |
parent | - remove dependency on ExtensionLoader.dll (DBConnString.cs can go) (diff) | |
download | opensim-SC-5277fc64c07da92014e749be40aa837193a26495.zip opensim-SC-5277fc64c07da92014e749be40aa837193a26495.tar.gz opensim-SC-5277fc64c07da92014e749be40aa837193a26495.tar.bz2 opensim-SC-5277fc64c07da92014e749be40aa837193a26495.tar.xz |
- change AssetInventoryServer config from XML to INI
- convert AssetInventoryServer logging to OpenSim's log4net
- updated AssetInventoryServer.ini.example file
Diffstat (limited to 'OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs')
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs index bb38d5d..09e91dc 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | using System; | 30 | using System; |
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Reflection; | ||
32 | using System.Collections.Generic; | 33 | using System.Collections.Generic; |
33 | using System.Collections.Specialized; | 34 | using System.Collections.Specialized; |
34 | using System.Net; | 35 | using System.Net; |
@@ -37,11 +38,13 @@ using System.Web; | |||
37 | using OpenMetaverse; | 38 | using OpenMetaverse; |
38 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
41 | using log4net; | ||
40 | 42 | ||
41 | namespace OpenSim.Grid.AssetInventoryServer.Plugins | 43 | namespace OpenSim.Grid.AssetInventoryServer.Plugins |
42 | { | 44 | { |
43 | public class BrowseFrontendPlugin : IAssetInventoryServerPlugin | 45 | public class BrowseFrontendPlugin : IAssetInventoryServerPlugin |
44 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | AssetInventoryServer m_server; | 48 | AssetInventoryServer m_server; |
46 | 49 | ||
47 | public BrowseFrontendPlugin() | 50 | public BrowseFrontendPlugin() |
@@ -58,7 +61,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
58 | //server.HttpServer.AddHandler("get", null, @"(^/$)|(^/\?.*)", BrowseRequestHandler); | 61 | //server.HttpServer.AddHandler("get", null, @"(^/$)|(^/\?.*)", BrowseRequestHandler); |
59 | m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server)); | 62 | m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server)); |
60 | 63 | ||
61 | Logger.Log.Info("[ASSET] Browser Frontend loaded."); | 64 | m_log.Info("[ASSET] Browser Frontend loaded."); |
62 | } | 65 | } |
63 | 66 | ||
64 | /// <summary> | 67 | /// <summary> |
@@ -66,7 +69,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
66 | /// </summary> | 69 | /// </summary> |
67 | public void Initialise() | 70 | public void Initialise() |
68 | { | 71 | { |
69 | Logger.Log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); | 72 | m_log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name); |
70 | throw new PluginNotInitialisedException(Name); | 73 | throw new PluginNotInitialisedException(Name); |
71 | } | 74 | } |
72 | 75 | ||