aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
-rw-r--r--OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs122
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs87
4 files changed, 214 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 8f4eba8..f1091b4 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -80,7 +80,9 @@ namespace OpenSim
80 { 80 {
81 log4net.Appender.FileAppender appender = 81 log4net.Appender.FileAppender appender =
82 (log4net.Appender.FileAppender)m_logFileAppender; 82 (log4net.Appender.FileAppender)m_logFileAppender;
83 appender.File = startupConfig.GetString("LogFile", "OpenSim.log"); 83 string fileName = startupConfig.GetString("LogFile", String.Empty);
84 if (fileName != String.Empty)
85 appender.File = fileName;
84 m_log.InfoFormat("[LOGGING] Logging started to file {0}", appender.File); 86 m_log.InfoFormat("[LOGGING] Logging started to file {0}", appender.File);
85 } 87 }
86 } 88 }
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 3a47806..b3a9c98 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -13,6 +13,8 @@
13 <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" /> 13 <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" />
14 <RegionModule id="LocalUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.User.LocalUserServicesConnector" /> 14 <RegionModule id="LocalUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.User.LocalUserServicesConnector" />
15 <RegionModule id="RemoteUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.User.RemoteUserServicesConnector" /> 15 <RegionModule id="RemoteUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.User.RemoteUserServicesConnector" />
16 <RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.Asset.LocalAssetServicesConnector" />
17 <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.Asset.RemoteAssetServicesConnector" />
16 </Extension> 18 </Extension>
17 19
18 <Extension path = "/OpenSim/WindModule"> 20 <Extension path = "/OpenSim/WindModule">
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
new file mode 100644
index 0000000..20e6de5
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
@@ -0,0 +1,122 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using log4net;
29using Nini.Config;
30using System;
31using System.Reflection;
32using OpenSim.Servers.Base;
33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Services.Interfaces;
36
37namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
38{
39 public class LocalAssetServicesConnector : ISharedRegionModule
40 {
41 private static readonly ILog m_log =
42 LogManager.GetLogger(
43 MethodBase.GetCurrentMethod().DeclaringType);
44
45 private IAssetService m_AssetService;
46
47 private bool m_Enabled = false;
48
49 public string Name
50 {
51 get { return "LocalAssetServicesConnector"; }
52 }
53
54 public void Initialise(IConfigSource source)
55 {
56 IConfig moduleConfig = source.Configs["Modules"];
57 if (moduleConfig != null)
58 {
59 string name = moduleConfig.GetString("AssetServices", "");
60 if (name == Name)
61 {
62 IConfig assetConfig = source.Configs["AssetService"];
63 if (assetConfig == null)
64 {
65 m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpanSim.ini");
66 return;
67 }
68
69 string serviceDll = assetConfig.GetString("Module",
70 String.Empty);
71
72 if (serviceDll == String.Empty)
73 {
74 m_log.Error("[ASSET CONNECTOR]: No ServiceDll named in section AssetService");
75 return;
76 }
77
78 Object[] args = new Object[] { source };
79 m_AssetService =
80 ServerUtils.LoadPlugin<IAssetService>(serviceDll,
81 args);
82
83 if (m_AssetService == null)
84 {
85 m_log.Error("[ASSET CONNECTOR]: Can't load asset service");
86 return;
87 }
88 m_Enabled = true;
89 m_log.Info("[ASSET CONNECTOR]: Local asset connector enabled");
90 }
91 }
92 }
93
94 public void PostInitialise()
95 {
96 }
97
98 public void Close()
99 {
100 }
101
102 public void AddRegion(Scene scene)
103 {
104 if (!m_Enabled)
105 return;
106
107 scene.RegisterModuleInterface<IAssetService>(m_AssetService);
108 }
109
110 public void RemoveRegion(Scene scene)
111 {
112 if (!m_Enabled)
113 return;
114 }
115
116 public void RegionLoaded(Scene scene)
117 {
118 if (!m_Enabled)
119 return;
120 }
121 }
122}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
new file mode 100644
index 0000000..15e4b5a
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
@@ -0,0 +1,87 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using Nini.Config;
29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes;
31using OpenSim.Services.Interfaces;
32
33namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
34{
35 public class RemoteAssetServicesConnector : ISharedRegionModule
36 {
37 private bool m_Enabled = false;
38
39 public string Name
40 {
41 get { return "RemoteAssetServicesConnector"; }
42 }
43
44 public void Initialise(IConfigSource source)
45 {
46 IConfig moduleConfig = source.Configs["Modules"];
47 if (moduleConfig != null)
48 {
49 string name = moduleConfig.GetString("AssetServices", "");
50 if (name == Name)
51 {
52 m_Enabled = true;
53 }
54 }
55 }
56
57 public void PostInitialise()
58 {
59 if (!m_Enabled)
60 return;
61 }
62
63 public void Close()
64 {
65 if (!m_Enabled)
66 return;
67 }
68
69 public void AddRegion(Scene scene)
70 {
71 if (!m_Enabled)
72 return;
73 }
74
75 public void RemoveRegion(Scene scene)
76 {
77 if (!m_Enabled)
78 return;
79 }
80
81 public void RegionLoaded(Scene scene)
82 {
83 if (!m_Enabled)
84 return;
85 }
86 }
87}