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

Modified visibilities of properties and methods. This is so that SL client based clients can use UDP server that is inherited from LLUDPServer.

0.6.8-post-fixes
Mikko Pallari 2009-10-27 12:51:47 +02:00 committed by John Hurliman
parent 603e3650d3
commit 8254256fe9
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,14 +314,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private readonly LLUDPClient m_udpClient; private readonly LLUDPClient m_udpClient;
private readonly UUID m_sessionId; private readonly UUID m_sessionId;
private readonly UUID m_secureSessionId; private readonly UUID m_secureSessionId;
private readonly UUID m_agentId; protected readonly UUID m_agentId;
private readonly uint m_circuitCode; private readonly uint m_circuitCode;
private readonly byte[] m_channelVersion = Utils.EmptyBytes; private readonly byte[] m_channelVersion = Utils.EmptyBytes;
private readonly Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>(); private readonly Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>();
private readonly IGroupsModule m_GroupsModule; private readonly IGroupsModule m_GroupsModule;
private int m_cachedTextureSerial; private int m_cachedTextureSerial;
private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_avatarTerseUpdates; protected PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_avatarTerseUpdates;
private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_primTerseUpdates; private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_primTerseUpdates;
private PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock> m_primFullUpdates; private PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock> m_primFullUpdates;
private int m_moneyBalance; private int m_moneyBalance;
@ -3314,7 +3314,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ProcessAvatarTerseUpdates(); ProcessAvatarTerseUpdates();
} }
private void ProcessAvatarTerseUpdates() protected void ProcessAvatarTerseUpdates()
{ {
ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate); ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
terse.Header.Reliable = false; terse.Header.Reliable = false;
@ -5050,7 +5050,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// </summary> /// </summary>
/// <param name="packet">Packet to send</param> /// <param name="packet">Packet to send</param>
/// <param name="throttlePacketType">Throttling category for the packet</param> /// <param name="throttlePacketType">Throttling category for the packet</param>
private void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType) protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType)
{ {
m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true); m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true);
} }
@ -10236,7 +10236,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
#region PriorityQueue #region PriorityQueue
private class PriorityQueue<TPriority, TValue> public class PriorityQueue<TPriority, TValue>
{ {
internal delegate bool UpdatePriorityHandler(ref TPriority priority, uint local_id); internal delegate bool UpdatePriorityHandler(ref TPriority priority, uint local_id);
@ -10264,7 +10264,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
this.m_comparison = comparison; this.m_comparison = comparison;
} }
internal object SyncRoot { get { return this.m_syncRoot; } } public object SyncRoot { get { return this.m_syncRoot; } }
internal int Count internal int Count
{ {
get get
@ -10276,7 +10276,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
internal bool Enqueue(TPriority priority, TValue value, uint local_id) public bool Enqueue(TPriority priority, TValue value, uint local_id)
{ {
LookupItem item; LookupItem item;

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

@ -118,13 +118,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <summary></summary> /// <summary></summary>
//private UDPClientCollection m_clients = new UDPClientCollection(); //private UDPClientCollection m_clients = new UDPClientCollection();
/// <summary>Bandwidth throttle for this UDP server</summary> /// <summary>Bandwidth throttle for this UDP server</summary>
private TokenBucket m_throttle; protected TokenBucket m_throttle;
/// <summary>Bandwidth throttle rates for this UDP server</summary> /// <summary>Bandwidth throttle rates for this UDP server</summary>
private ThrottleRates m_throttleRates; protected ThrottleRates m_throttleRates;
/// <summary>Manages authentication for agent circuits</summary> /// <summary>Manages authentication for agent circuits</summary>
private AgentCircuitManager m_circuitManager; private AgentCircuitManager m_circuitManager;
/// <summary>Reference to the scene this UDP server is attached to</summary> /// <summary>Reference to the scene this UDP server is attached to</summary>
private Scene m_scene; protected Scene m_scene;
/// <summary>The X/Y coordinates of the scene this UDP server is attached to</summary> /// <summary>The X/Y coordinates of the scene this UDP server is attached to</summary>
private Location m_location; private Location m_location;
/// <summary>The size of the receive buffer for the UDP socket. This value /// <summary>The size of the receive buffer for the UDP socket. This value
@ -759,7 +759,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
private void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo) protected virtual void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo)
{ {
// Create the LLUDPClient // Create the LLUDPClient
LLUDPClient udpClient = new LLUDPClient(this, m_throttleRates, m_throttle, circuitCode, agentID, remoteEndPoint); LLUDPClient udpClient = new LLUDPClient(this, m_throttleRates, m_throttle, circuitCode, agentID, remoteEndPoint);
@ -976,7 +976,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
private void LogoutHandler(IClientAPI client) protected void LogoutHandler(IClientAPI client)
{ {
client.SendLogoutPacket(); client.SendLogoutPacket();
if (client.IsActive) if (client.IsActive)