OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor RegionAssetService to load the service connector rather than 

duplicating it's functionality
0.6.6-post-fixes
Melanie Thielker 2009-05-19 00:36:06 +00:00
parent 23d902be42
commit 744100821d
2 changed files with 35 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
OpenSim/SimulatorServices/RegionAssetService.cs
View File

@ -25,51 +25,40 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System;
using System.Reflection; using System.Reflection;
using System.Collections.Generic;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Server.Handlers.Asset; using OpenSim.Server.Base;
using OpenSim.Server.Handlers.Base;
namespace OpenSim.Region.SimulatorServices namespace OpenSim.Region.SimulatorServices
{ {
public class RegionAssetService : IRegionModule public class RegionAssetService : ISharedRegionModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static bool initialized = false;
private static bool enabled = false; private static bool enabled = false;
private bool m_gridMode = false; private IConfigSource m_Config;
Scene m_scene; bool m_Registered = false;
#region IRegionModule interface #region IRegionModule interface
public void Initialise(Scene scene, IConfigSource config) public void Initialise(IConfigSource config)
{ {
if (!initialized) // This module is only on for standalones in hypergrid mode
{ enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
initialized = true; config.Configs["Startup"].GetBoolean("hypergrid", true)) ||
m_scene = scene; ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true));
// This module is only on for standalones in hypergrid mode
enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
config.Configs["Startup"].GetBoolean("hypergrid", true)) ||
((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true));
m_gridMode = config.Configs["Startup"].GetBoolean("gridmode", true);
}
} }
public void PostInitialise() public void PostInitialise()
{ {
if (enabled)
{
m_log.Info("[RegionAssetService]: Starting...");
new AssetService(m_scene,m_gridMode);
}
} }
public void Close() public void Close()
@ -81,43 +70,32 @@ namespace OpenSim.Region.SimulatorServices
get { return "RegionAssetService"; } get { return "RegionAssetService"; }
} }
public bool IsSharedModule public void AddRegion(Scene scene)
{
if (!enabled)
return;
if (!m_Registered)
{
m_Registered = true;
m_log.Info("[RegionAssetService]: Starting...");
Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args);
}
}
public void RemoveRegion(Scene scene)
{
}
public void RegionLoaded(Scene scene)
{ {
get { return true; }
} }
#endregion #endregion
} }
public class AssetService
{
private bool m_doLookup = false;
private bool m_gridMode = false;
public bool DoLookup
{
get { return m_doLookup; }
set { m_doLookup = value; }
}
// private static readonly ILog m_log
// = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public AssetService(Scene m_scene, bool gridMode)
{
m_gridMode = gridMode;
AddHttpHandlers(m_scene);
}
protected void AddHttpHandlers(Scene m_scene)
{
IHttpServer httpServer = m_scene.CommsManager.HttpServer;
httpServer.AddStreamHandler(new AssetServerGetHandler(m_scene.AssetService));
httpServer.AddStreamHandler(new AssetServerPostHandler(m_scene.AssetService));
httpServer.AddStreamHandler(new AssetServerDeleteHandler(m_scene.AssetService));
}
}
} }

1
prebuild.xml
View File

@ -1603,6 +1603,7 @@
<Reference name="OpenSim.Framework.Servers.HttpServer" /> <Reference name="OpenSim.Framework.Servers.HttpServer" />
<Reference name="OpenSim.Region.Framework" /> <Reference name="OpenSim.Region.Framework" />
<Reference name="OpenSim.Services.Interfaces"/> <Reference name="OpenSim.Services.Interfaces"/>
<Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Server.Handlers"/> <Reference name="OpenSim.Server.Handlers"/>
<Reference name="Mono.Addins.dll" /> <Reference name="Mono.Addins.dll" />
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>