diff options
Diffstat (limited to '')
4 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 71fced9..f53174a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
65 | 65 | ||
66 | private int m_debugPacketLevel; | 66 | private int m_debugPacketLevel; |
67 | 67 | ||
68 | private readonly AssetCache m_assetCache; | 68 | private readonly IAssetCache m_assetCache; |
69 | private int m_cachedTextureSerial; | 69 | private int m_cachedTextureSerial; |
70 | private Timer m_clientPingTimer; | 70 | private Timer m_clientPingTimer; |
71 | 71 | ||
@@ -429,7 +429,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
429 | /// Constructor | 429 | /// Constructor |
430 | /// </summary> | 430 | /// </summary> |
431 | public LLClientView( | 431 | public LLClientView( |
432 | EndPoint remoteEP, IScene scene, AssetCache assetCache, LLPacketServer packServer, | 432 | EndPoint remoteEP, IScene scene, IAssetCache assetCache, LLPacketServer packServer, |
433 | AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP, | 433 | AuthenticateResponse sessionInfo, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP, |
434 | ClientStackUserSettings userSettings) | 434 | ClientStackUserSettings userSettings) |
435 | { | 435 | { |
@@ -3748,7 +3748,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3748 | handlerGenericMessage(sender, method, msg); | 3748 | handlerGenericMessage(sender, method, msg); |
3749 | return true; | 3749 | return true; |
3750 | } | 3750 | } |
3751 | catch(Exception e) | 3751 | catch (Exception e) |
3752 | { | 3752 | { |
3753 | m_log.Error("[GENERICMESSAGE] " + e); | 3753 | m_log.Error("[GENERICMESSAGE] " + e); |
3754 | } | 3754 | } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs index 9b71770..43a2e23 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
55 | new Dictionary<UUID, IPriorityQueueHandle<Prio<J2KImage>>>(); | 55 | new Dictionary<UUID, IPriorityQueueHandle<Prio<J2KImage>>>(); |
56 | 56 | ||
57 | private LLClientView m_client; | 57 | private LLClientView m_client; |
58 | private readonly AssetCache m_assetCache; | 58 | private readonly IAssetCache m_assetCache; |
59 | private bool m_shuttingdown = false; | 59 | private bool m_shuttingdown = false; |
60 | private readonly IJ2KDecoder m_j2kDecodeModule; | 60 | private readonly IJ2KDecoder m_j2kDecodeModule; |
61 | 61 | ||
@@ -67,7 +67,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
67 | /// <param name="client">LLClientView of client</param> | 67 | /// <param name="client">LLClientView of client</param> |
68 | /// <param name="pAssetCache">The Asset retrieval system</param> | 68 | /// <param name="pAssetCache">The Asset retrieval system</param> |
69 | /// <param name="pJ2kDecodeModule">The Jpeg2000 Decoder</param> | 69 | /// <param name="pJ2kDecodeModule">The Jpeg2000 Decoder</param> |
70 | public LLImageManager(LLClientView client, AssetCache pAssetCache, IJ2KDecoder pJ2kDecodeModule) | 70 | public LLImageManager(LLClientView client, IAssetCache pAssetCache, IJ2KDecoder pJ2kDecodeModule) |
71 | { | 71 | { |
72 | m_client = client; | 72 | m_client = client; |
73 | m_assetCache = pAssetCache; | 73 | m_assetCache = pAssetCache; |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs index 2b52220..a42ae04 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | |||
@@ -90,7 +90,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
90 | /// <param name="proxyEP"></param> | 90 | /// <param name="proxyEP"></param> |
91 | /// <returns></returns> | 91 | /// <returns></returns> |
92 | protected virtual IClientAPI CreateNewCircuit( | 92 | protected virtual IClientAPI CreateNewCircuit( |
93 | EndPoint remoteEP, IScene scene, AssetCache assetCache, | 93 | EndPoint remoteEP, IScene scene, IAssetCache assetCache, |
94 | LLPacketServer packServer, AuthenticateResponse sessionInfo, | 94 | LLPacketServer packServer, AuthenticateResponse sessionInfo, |
95 | UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP) | 95 | UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP) |
96 | { | 96 | { |
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
134 | /// true if a new circuit was created, false if a circuit with the given circuit code already existed | 134 | /// true if a new circuit was created, false if a circuit with the given circuit code already existed |
135 | /// </returns> | 135 | /// </returns> |
136 | public virtual bool AddNewClient( | 136 | public virtual bool AddNewClient( |
137 | EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, | 137 | EndPoint epSender, UseCircuitCodePacket useCircuit, IAssetCache assetCache, |
138 | AuthenticateResponse sessionInfo, EndPoint proxyEP) | 138 | AuthenticateResponse sessionInfo, EndPoint proxyEP) |
139 | { | 139 | { |
140 | IClientAPI newuser; | 140 | IClientAPI newuser; |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index f53d485..bdc4490 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
76 | protected bool Allow_Alternate_Port; | 76 | protected bool Allow_Alternate_Port; |
77 | protected IPAddress listenIP = IPAddress.Parse("0.0.0.0"); | 77 | protected IPAddress listenIP = IPAddress.Parse("0.0.0.0"); |
78 | protected IScene m_localScene; | 78 | protected IScene m_localScene; |
79 | protected AssetCache m_assetCache; | 79 | protected IAssetCache m_assetCache; |
80 | 80 | ||
81 | /// <value> | 81 | /// <value> |
82 | /// Manages authentication for agent circuits | 82 | /// Manages authentication for agent circuits |
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
131 | 131 | ||
132 | public LLUDPServer( | 132 | public LLUDPServer( |
133 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, | 133 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, |
134 | AssetCache assetCache, AgentCircuitManager authenticateClass) | 134 | IAssetCache assetCache, AgentCircuitManager authenticateClass) |
135 | { | 135 | { |
136 | Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, assetCache, authenticateClass); | 136 | Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, assetCache, authenticateClass); |
137 | } | 137 | } |
@@ -148,7 +148,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
148 | /// <param name="circuitManager"></param> | 148 | /// <param name="circuitManager"></param> |
149 | public void Initialise( | 149 | public void Initialise( |
150 | IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, | 150 | IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, |
151 | AssetCache assetCache, AgentCircuitManager circuitManager) | 151 | IAssetCache assetCache, AgentCircuitManager circuitManager) |
152 | { | 152 | { |
153 | ClientStackUserSettings userSettings = new ClientStackUserSettings(); | 153 | ClientStackUserSettings userSettings = new ClientStackUserSettings(); |
154 | 154 | ||