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

Removed IAssetCache. 

WARNING: PLEASE MAKE SURE TO USE THIS NEW bin/OpenSim.addin.xml
arthursv
Diva Canto 2009-08-10 08:14:57 -07:00
parent 7e13e96f56
commit 0d8284c7a1
10 changed files with 18 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
View File

@ -190,11 +190,11 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
{
HGGridServicesStandalone gridService
= new HGGridServicesStandalone(
m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager);
m_openSim.NetServersInfo, m_httpServer, m_openSim.SceneManager);
m_commsManager
= new HGCommunicationsStandalone(
m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer,
gridService,
libraryRootFolder, false);

18
OpenSim/Region/Application/OpenSim.cs
View File

@ -416,14 +416,7 @@ namespace OpenSim
private void HandleClearAssets(string module, string[] args)
{
if (AssetCache != null)
{
AssetCache.Clear();
}
else
{
m_log.Info("Asset cache is not configured.");
}
m_log.Info("Not implemented.");
}
private void HandleForceUpdate(string module, string[] args)
@ -815,14 +808,7 @@ namespace OpenSim
switch (showParams[0])
{
case "assets":
if (AssetCache != null)
{
AssetCache.ShowState();
}
else
{
m_log.Info("Asset cache is not configured.");
}
m_log.Info("Not implemented.");
break;
case "users":

2
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -488,7 +488,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Constructor
/// </summary>
public LLClientView(
EndPoint remoteEP, IScene scene, IAssetCache assetCache, LLPacketServer packServer,
EndPoint remoteEP, IScene scene, LLPacketServer packServer,
AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP,
ClientStackUserSettings userSettings)
{

8
OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
View File

@ -87,13 +87,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <param name="proxyEP"></param>
/// <returns></returns>
protected virtual IClientAPI CreateNewCircuit(
EndPoint remoteEP, IScene scene, IAssetCache assetCache,
EndPoint remoteEP, IScene scene,
LLPacketServer packServer, AuthenticateResponse sessionInfo,
UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP)
{
return
new LLClientView(
remoteEP, scene, assetCache, packServer, sessionInfo, agentId, sessionId, circuitCode, proxyEP,
remoteEP, scene, packServer, sessionInfo, agentId, sessionId, circuitCode, proxyEP,
m_userSettings);
}
@ -131,7 +131,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// true if a new circuit was created, false if a circuit with the given circuit code already existed
/// </returns>
public virtual bool AddNewClient(
EndPoint epSender, UseCircuitCodePacket useCircuit, IAssetCache assetCache,
EndPoint epSender, UseCircuitCodePacket useCircuit,
AuthenticateResponse sessionInfo, EndPoint proxyEP)
{
IClientAPI newuser;
@ -150,7 +150,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
newuser
= CreateNewCircuit(
epSender, m_scene, assetCache, this, sessionInfo, agentId, sessionId, circuitCode, proxyEP);
epSender, m_scene, this, sessionInfo, agentId, sessionId, circuitCode, proxyEP);
m_scene.ClientManager.Add(circuitCode, newuser);

7
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -75,7 +75,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected bool Allow_Alternate_Port;
protected IPAddress listenIP = IPAddress.Parse("0.0.0.0");
protected IScene m_localScene;
protected IAssetCache m_assetCache;
protected int m_clientSocketReceiveBuffer = 0;
/// <value>
@ -131,7 +130,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public LLUDPServer(
IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource,
IAssetCache assetCache, AgentCircuitManager authenticateClass)
AgentCircuitManager authenticateClass)
{
Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, authenticateClass);
}
@ -451,7 +450,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
proxyCircuits[useCircuit.CircuitCode.Code] = epProxy;
}
m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy);
m_packetServer.AddNewClient(epSender, useCircuit, sessionInfo, epProxy);
//m_log.DebugFormat(
// "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}",
@ -629,7 +628,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
}
m_packetServer.AddNewClient(userEP, useCircuit, m_assetCache, sessionInfo, proxyEP);
m_packetServer.AddNewClient(userEP, useCircuit, sessionInfo, proxyEP);
}
}
}

10
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -72,15 +72,7 @@ namespace OpenSim.Region.ClientStack
get { return m_sceneManager; }
}
protected SceneManager m_sceneManager = new SceneManager();
protected IAssetCache m_assetCache;
public IAssetCache AssetCache
{
get { return m_assetCache; }
set { m_assetCache = value; }
}
protected abstract void Initialize();
/// <summary>

1
OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
View File

@ -44,7 +44,6 @@ namespace OpenSim.Region.Communications.Hypergrid
ConfigSettings configSettings,
NetworkServersInfo serversInfo,
BaseHttpServer httpServer,
IAssetCache assetCache,
HGGridServices gridService,
LibraryRootFolder libraryRootFolder,
bool dumpAssetsToFile)

2
OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
View File

@ -76,7 +76,7 @@ namespace OpenSim.Region.Communications.Hypergrid
}
public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman)
public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, SceneManager sman)
: base(servers_info, sman)
{
//Respond to Grid Services requests

7
OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
View File

@ -35,6 +35,7 @@ using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Serialization;
using OpenSim.Services.Interfaces;
namespace OpenSim.Region.CoreModules.World.Archiver
{
@ -60,9 +61,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
/// <summary>
/// Cache to which dearchived assets will be added
/// </summary>
protected IAssetCache m_cache;
protected IAssetService m_cache;
public AssetsDearchiver(IAssetCache cache)
public AssetsDearchiver(IAssetService cache)
{
m_cache = cache;
}
@ -162,7 +163,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
asset.Type = metadata.AssetType;
asset.Data = data;
m_cache.AddAsset(asset);
m_cache.Store(asset);
}
else
{

4
bin/OpenSim.addin.xml
View File

@ -10,10 +10,6 @@
<ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.IApplicationPlugin"/>
</ExtensionPoint>
<ExtensionPoint path="/OpenSim/AssetCache" name="Region Asset Cache Plugin-point" >
<ExtensionNode name="Cache" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IAssetCache"/>
</ExtensionPoint>
<ExtensionPoint path="/OpenSim/WindModule" name="Wind Module Plugins for wind models">
<ExtensionNode name="WindModel" type="Mono.Addins.TypeExtensionNode" objectType="OpenSim.Region.Framework.Interfaces.IWindModelPlugin"/>
</ExtensionPoint>