diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index f6a7a0c..d6d1a95 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -314,14 +314,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
314 | private readonly LLUDPClient m_udpClient; | 314 | private readonly LLUDPClient m_udpClient; |
315 | private readonly UUID m_sessionId; | 315 | private readonly UUID m_sessionId; |
316 | private readonly UUID m_secureSessionId; | 316 | private readonly UUID m_secureSessionId; |
317 | private readonly UUID m_agentId; | 317 | protected readonly UUID m_agentId; |
318 | private readonly uint m_circuitCode; | 318 | private readonly uint m_circuitCode; |
319 | private readonly byte[] m_channelVersion = Utils.EmptyBytes; | 319 | private readonly byte[] m_channelVersion = Utils.EmptyBytes; |
320 | private readonly Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>(); | 320 | private readonly Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>(); |
321 | private readonly IGroupsModule m_GroupsModule; | 321 | private readonly IGroupsModule m_GroupsModule; |
322 | 322 | ||
323 | private int m_cachedTextureSerial; | 323 | private int m_cachedTextureSerial; |
324 | private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_avatarTerseUpdates; | 324 | protected PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_avatarTerseUpdates; |
325 | private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_primTerseUpdates; | 325 | private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_primTerseUpdates; |
326 | private PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock> m_primFullUpdates; | 326 | private PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock> m_primFullUpdates; |
327 | private int m_moneyBalance; | 327 | private int m_moneyBalance; |
@@ -3314,7 +3314,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3314 | ProcessAvatarTerseUpdates(); | 3314 | ProcessAvatarTerseUpdates(); |
3315 | } | 3315 | } |
3316 | 3316 | ||
3317 | private void ProcessAvatarTerseUpdates() | 3317 | protected void ProcessAvatarTerseUpdates() |
3318 | { | 3318 | { |
3319 | ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate); | 3319 | ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate); |
3320 | terse.Header.Reliable = false; | 3320 | terse.Header.Reliable = false; |
@@ -5050,7 +5050,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5050 | /// </summary> | 5050 | /// </summary> |
5051 | /// <param name="packet">Packet to send</param> | 5051 | /// <param name="packet">Packet to send</param> |
5052 | /// <param name="throttlePacketType">Throttling category for the packet</param> | 5052 | /// <param name="throttlePacketType">Throttling category for the packet</param> |
5053 | private void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType) | 5053 | protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType) |
5054 | { | 5054 | { |
5055 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true); | 5055 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true); |
5056 | } | 5056 | } |
@@ -10236,7 +10236,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10236 | } | 10236 | } |
10237 | 10237 | ||
10238 | #region PriorityQueue | 10238 | #region PriorityQueue |
10239 | private class PriorityQueue<TPriority, TValue> | 10239 | public class PriorityQueue<TPriority, TValue> |
10240 | { | 10240 | { |
10241 | internal delegate bool UpdatePriorityHandler(ref TPriority priority, uint local_id); | 10241 | internal delegate bool UpdatePriorityHandler(ref TPriority priority, uint local_id); |
10242 | 10242 | ||
@@ -10264,7 +10264,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10264 | this.m_comparison = comparison; | 10264 | this.m_comparison = comparison; |
10265 | } | 10265 | } |
10266 | 10266 | ||
10267 | internal object SyncRoot { get { return this.m_syncRoot; } } | 10267 | public object SyncRoot { get { return this.m_syncRoot; } } |
10268 | internal int Count | 10268 | internal int Count |
10269 | { | 10269 | { |
10270 | get | 10270 | get |
@@ -10276,7 +10276,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10276 | } | 10276 | } |
10277 | } | 10277 | } |
10278 | 10278 | ||
10279 | internal bool Enqueue(TPriority priority, TValue value, uint local_id) | 10279 | public bool Enqueue(TPriority priority, TValue value, uint local_id) |
10280 | { | 10280 | { |
10281 | LookupItem item; | 10281 | LookupItem item; |
10282 | 10282 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 74d3262..dc72939 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -118,13 +118,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
118 | /// <summary></summary> | 118 | /// <summary></summary> |
119 | //private UDPClientCollection m_clients = new UDPClientCollection(); | 119 | //private UDPClientCollection m_clients = new UDPClientCollection(); |
120 | /// <summary>Bandwidth throttle for this UDP server</summary> | 120 | /// <summary>Bandwidth throttle for this UDP server</summary> |
121 | private TokenBucket m_throttle; | 121 | protected TokenBucket m_throttle; |
122 | /// <summary>Bandwidth throttle rates for this UDP server</summary> | 122 | /// <summary>Bandwidth throttle rates for this UDP server</summary> |
123 | private ThrottleRates m_throttleRates; | 123 | protected ThrottleRates m_throttleRates; |
124 | /// <summary>Manages authentication for agent circuits</summary> | 124 | /// <summary>Manages authentication for agent circuits</summary> |
125 | private AgentCircuitManager m_circuitManager; | 125 | private AgentCircuitManager m_circuitManager; |
126 | /// <summary>Reference to the scene this UDP server is attached to</summary> | 126 | /// <summary>Reference to the scene this UDP server is attached to</summary> |
127 | private Scene m_scene; | 127 | protected Scene m_scene; |
128 | /// <summary>The X/Y coordinates of the scene this UDP server is attached to</summary> | 128 | /// <summary>The X/Y coordinates of the scene this UDP server is attached to</summary> |
129 | private Location m_location; | 129 | private Location m_location; |
130 | /// <summary>The size of the receive buffer for the UDP socket. This value | 130 | /// <summary>The size of the receive buffer for the UDP socket. This value |
@@ -759,7 +759,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
759 | } | 759 | } |
760 | } | 760 | } |
761 | 761 | ||
762 | private void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo) | 762 | protected virtual void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo) |
763 | { | 763 | { |
764 | // Create the LLUDPClient | 764 | // Create the LLUDPClient |
765 | LLUDPClient udpClient = new LLUDPClient(this, m_throttleRates, m_throttle, circuitCode, agentID, remoteEndPoint); | 765 | LLUDPClient udpClient = new LLUDPClient(this, m_throttleRates, m_throttle, circuitCode, agentID, remoteEndPoint); |
@@ -976,7 +976,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
976 | } | 976 | } |
977 | } | 977 | } |
978 | 978 | ||
979 | private void LogoutHandler(IClientAPI client) | 979 | protected void LogoutHandler(IClientAPI client) |
980 | { | 980 | { |
981 | client.SendLogoutPacket(); | 981 | client.SendLogoutPacket(); |
982 | if (client.IsActive) | 982 | if (client.IsActive) |