ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed IAssetCache.

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

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>