diff options
author | diva | 2009-05-22 04:23:59 +0000 |
---|---|---|
committer | diva | 2009-05-22 04:23:59 +0000 |
commit | da170cde4684ea0f8ed90ea4ed0b30172ad9981d (patch) | |
tree | 0ffc809b31853d81479fee0c4e053025d31adb9d /OpenSim/SimulatorServices | |
parent | Removing the [UserService] section, because it's not working yet. (diff) | |
download | opensim-SC_OLD-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.zip opensim-SC_OLD-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.tar.gz opensim-SC_OLD-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.tar.bz2 opensim-SC_OLD-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.tar.xz |
Cleaning up a few HG things. HG Posts may now work in grids, but if the home grid is a standalone, this still doesn't work -- something wrong with RegionAssetService's DB connection.
Diffstat (limited to 'OpenSim/SimulatorServices')
-rw-r--r-- | OpenSim/SimulatorServices/RegionAssetService.cs | 4 | ||||
-rw-r--r-- | OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml | 14 |
2 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/SimulatorServices/RegionAssetService.cs b/OpenSim/SimulatorServices/RegionAssetService.cs index 06f42d3..a9080f7 100644 --- a/OpenSim/SimulatorServices/RegionAssetService.cs +++ b/OpenSim/SimulatorServices/RegionAssetService.cs | |||
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
37 | using OpenSim.Server.Base; | 37 | using OpenSim.Server.Base; |
38 | using OpenSim.Server.Handlers.Base; | 38 | using OpenSim.Server.Handlers.Base; |
39 | 39 | ||
40 | namespace OpenSim.Region.SimulatorServices | 40 | namespace OpenSim.SimulatorServices |
41 | { | 41 | { |
42 | public class RegionAssetService : ISharedRegionModule | 42 | public class RegionAssetService : ISharedRegionModule |
43 | { | 43 | { |
@@ -55,6 +55,8 @@ namespace OpenSim.Region.SimulatorServices | |||
55 | enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) && | 55 | enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) && |
56 | config.Configs["Startup"].GetBoolean("hypergrid", true)) || | 56 | config.Configs["Startup"].GetBoolean("hypergrid", true)) || |
57 | ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true)); | 57 | ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true)); |
58 | m_log.DebugFormat("[RegionAssetService]: enabled? {0}", enabled); | ||
59 | m_Config = config; | ||
58 | } | 60 | } |
59 | 61 | ||
60 | public void PostInitialise() | 62 | public void PostInitialise() |
diff --git a/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml b/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml new file mode 100644 index 0000000..accc467 --- /dev/null +++ b/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml | |||
@@ -0,0 +1,14 @@ | |||
1 | <Addin id="OpenSim.SimulatorServices" version="0.2"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.SimulatorServices.dll"/> | ||
4 | </Runtime> | ||
5 | |||
6 | <Dependencies> | ||
7 | <Addin id="OpenSim" version="0.5" /> | ||
8 | </Dependencies> | ||
9 | |||
10 | <Extension path = "/OpenSim/RegionModules"> | ||
11 | <RegionModule id="RegionAssetService" type="OpenSim.SimulatorServices.RegionAssetService" /> | ||
12 | </Extension> | ||
13 | |||
14 | </Addin> | ||