aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/RegionAssetService.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/RegionAssetService.cs (renamed from OpenSim/SimulatorServices/RegionAssetService.cs)216
1 files changed, 113 insertions, 103 deletions
diff --git a/OpenSim/SimulatorServices/RegionAssetService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/RegionAssetService.cs
index b8e1adc..d4bd299 100644
--- a/OpenSim/SimulatorServices/RegionAssetService.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/RegionAssetService.cs
@@ -1,103 +1,113 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the 12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products 13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 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 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 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 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using log4net; 31using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Servers.HttpServer; 34using OpenSim.Framework.Servers.HttpServer;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Server.Base; 37using OpenSim.Server.Base;
38using OpenSim.Server.Handlers.Base; 38using OpenSim.Server.Handlers.Base;
39 39
40namespace OpenSim.SimulatorServices 40namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
41{ 41{
42 public class RegionAssetService : ISharedRegionModule 42 public class RegionAssetService : ISharedRegionModule
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 private static bool enabled = false; 45 private static bool m_Enabled = false;
46 46
47 private IConfigSource m_Config; 47 private IConfigSource m_Config;
48 bool m_Registered = false; 48 bool m_Registered = false;
49 49
50 #region IRegionModule interface 50 #region IRegionModule interface
51 51
52 public void Initialise(IConfigSource config) 52 public void Initialise(IConfigSource config)
53 { 53 {
54 // This module is only on for standalones in hypergrid mode 54 //// This module is only on for standalones in hypergrid mode
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); 58 //m_log.DebugFormat("[RegionAssetService]: enabled? {0}", enabled);
59 m_Config = config; 59 m_Config = config;
60 } 60 IConfig moduleConfig = config.Configs["Modules"];
61 61 if (moduleConfig != null)
62 public void PostInitialise() 62 {
63 { 63 m_Enabled = moduleConfig.GetBoolean("AssetServiceInConnector", false);
64 } 64 if (m_Enabled)
65 65 {
66 public void Close() 66 m_log.Info("[ASSET IN CONNECTOR]: AssetServiceInConnector enabled");
67 { 67 }
68 } 68
69 69 }
70 public string Name 70 }
71 { 71
72 get { return "RegionAssetService"; } 72 public void PostInitialise()
73 } 73 {
74 74 }
75 public void AddRegion(Scene scene) 75
76 { 76 public void Close()
77 if (!enabled) 77 {
78 return; 78 }
79 79
80 if (!m_Registered) 80 public string Name
81 { 81 {
82 m_Registered = true; 82 get { return "RegionAssetService"; }
83 83 }
84 m_log.Info("[RegionAssetService]: Starting..."); 84
85 85 public void AddRegion(Scene scene)
86 Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; 86 {
87 87 if (!m_Enabled)
88 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args); 88 return;
89 } 89
90 } 90 if (!m_Registered)
91 91 {
92 public void RemoveRegion(Scene scene) 92 m_Registered = true;
93 { 93
94 } 94 m_log.Info("[RegionAssetService]: Starting...");
95 95
96 public void RegionLoaded(Scene scene) 96 Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
97 { 97
98 } 98 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args);
99 99 }
100 #endregion 100 }
101 101
102 } 102 public void RemoveRegion(Scene scene)
103} 103 {
104 }
105
106 public void RegionLoaded(Scene scene)
107 {
108 }
109
110 #endregion
111
112 }
113}
generated by cgit v1.1 at 2024-07-18 02:06:26 +0000