diff options
author | Mikko Pallari | 2009-10-27 12:51:47 +0200 |
---|---|---|
committer | John Hurliman | 2009-10-28 00:41:13 -0700 |
commit | 8254256fe9eaa66c49ca981d3c8233bcc0c86eed (patch) | |
tree | da5348886807e87fc1198658e8e3776233f37d6e /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-8254256fe9eaa66c49ca981d3c8233bcc0c86eed.zip opensim-SC_OLD-8254256fe9eaa66c49ca981d3c8233bcc0c86eed.tar.gz opensim-SC_OLD-8254256fe9eaa66c49ca981d3c8233bcc0c86eed.tar.bz2 opensim-SC_OLD-8254256fe9eaa66c49ca981d3c8233bcc0c86eed.tar.xz |
Modified visibilities of properties and methods. This is so that SL client based clients can use UDP server that is inherited from LLUDPServer.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 14 |
1 files changed, 7 insertions, 7 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 | ||