diff options
| author | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
| commit | 564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c (patch) | |
| tree | 1d046904229e0a6c36481c255ceb71eda7c72872 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs | |
| parent | Stop Prebuild from generating <copy> statements which unnecessarily copy file... (diff) | |
| parent | Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll. (diff) | |
| download | opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.zip opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.gz opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.bz2 opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs index 1e1c7d0..d221d68 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | using log4net; | 28 | using log4net; |
| 29 | using Mono.Addins; | ||
| 29 | using Nini.Config; | 30 | using Nini.Config; |
| 30 | using System; | 31 | using System; |
| 31 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |
| @@ -40,8 +41,8 @@ using OpenMetaverse; | |||
| 40 | 41 | ||
| 41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | 42 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset |
| 42 | { | 43 | { |
| 43 | public class HGAssetBroker : | 44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGAssetBroker")] |
| 44 | ISharedRegionModule, IAssetService | 45 | public class HGAssetBroker : ISharedRegionModule, IAssetService |
| 45 | { | 46 | { |
| 46 | private static readonly ILog m_log = | 47 | private static readonly ILog m_log = |
| 47 | LogManager.GetLogger( | 48 | LogManager.GetLogger( |