diff options
author | Jeff Ames | 2008-05-25 23:27:38 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-25 23:27:38 +0000 |
commit | 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch) | |
tree | b010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Region/ClientStack | |
parent | * A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff) | |
download | opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2 opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 25 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | 4 |
2 files changed, 13 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 11fb5be..e27a003 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -98,7 +98,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
98 | 98 | ||
99 | private Dictionary<string, LLUUID> m_defaultAnimations = new Dictionary<string, LLUUID>(); | 99 | private Dictionary<string, LLUUID> m_defaultAnimations = new Dictionary<string, LLUUID>(); |
100 | 100 | ||
101 | |||
102 | /* protected variables */ | 101 | /* protected variables */ |
103 | 102 | ||
104 | protected static Dictionary<PacketType, PacketMethod> PacketHandlers = | 103 | protected static Dictionary<PacketType, PacketMethod> PacketHandlers = |
@@ -413,7 +412,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
413 | 412 | ||
414 | Thread.Sleep(2000); | 413 | Thread.Sleep(2000); |
415 | 414 | ||
416 | |||
417 | // Shut down timers | 415 | // Shut down timers |
418 | m_ackTimer.Stop(); | 416 | m_ackTimer.Stop(); |
419 | m_clientPingTimer.Stop(); | 417 | m_clientPingTimer.Stop(); |
@@ -782,7 +780,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
782 | public event TeleportLocationRequest OnSetStartLocationRequest; | 780 | public event TeleportLocationRequest OnSetStartLocationRequest; |
783 | public event UpdateAvatarProperties OnUpdateAvatarProperties; | 781 | public event UpdateAvatarProperties OnUpdateAvatarProperties; |
784 | 782 | ||
785 | |||
786 | public event CreateNewInventoryItem OnCreateNewInventoryItem; | 783 | public event CreateNewInventoryItem OnCreateNewInventoryItem; |
787 | public event CreateInventoryFolder OnCreateNewInventoryFolder; | 784 | public event CreateInventoryFolder OnCreateNewInventoryFolder; |
788 | public event UpdateInventoryFolder OnUpdateInventoryFolder; | 785 | public event UpdateInventoryFolder OnUpdateInventoryFolder; |
@@ -937,13 +934,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
937 | /// <param name="fromPos"></param> | 934 | /// <param name="fromPos"></param> |
938 | /// <param name="fromName"></param> | 935 | /// <param name="fromName"></param> |
939 | /// <param name="fromAgentID"></param> | 936 | /// <param name="fromAgentID"></param> |
940 | public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, | 937 | public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, |
941 | LLUUID fromAgentID, byte source, byte audible) | 938 | LLUUID fromAgentID, byte source, byte audible) |
942 | { | 939 | { |
943 | SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID, source, audible); | 940 | SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID, source, audible); |
944 | } | 941 | } |
945 | 942 | ||
946 | public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, | 943 | public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, |
947 | LLUUID fromAgentID, byte source, byte audible) | 944 | LLUUID fromAgentID, byte source, byte audible) |
948 | { | 945 | { |
949 | ChatFromSimulatorPacket reply = (ChatFromSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.ChatFromSimulator); | 946 | ChatFromSimulatorPacket reply = (ChatFromSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.ChatFromSimulator); |
@@ -3172,7 +3169,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3172 | 3169 | ||
3173 | public bool HandleObjectGroupRequest(IClientAPI sender, Packet Pack) | 3170 | public bool HandleObjectGroupRequest(IClientAPI sender, Packet Pack) |
3174 | { | 3171 | { |
3175 | 3172 | ||
3176 | ObjectGroupPacket ogpack = (ObjectGroupPacket)Pack; | 3173 | ObjectGroupPacket ogpack = (ObjectGroupPacket)Pack; |
3177 | handlerObjectGroupRequest = OnObjectGroupRequest; | 3174 | handlerObjectGroupRequest = OnObjectGroupRequest; |
3178 | if (handlerObjectGroupRequest != null) | 3175 | if (handlerObjectGroupRequest != null) |
@@ -3185,7 +3182,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3185 | return true; | 3182 | return true; |
3186 | } | 3183 | } |
3187 | 3184 | ||
3188 | 3185 | ||
3189 | 3186 | ||
3190 | private bool HandleViewerEffect(IClientAPI sender, Packet Pack) | 3187 | private bool HandleViewerEffect(IClientAPI sender, Packet Pack) |
3191 | { | 3188 | { |
@@ -3875,7 +3872,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3875 | } | 3872 | } |
3876 | else | 3873 | else |
3877 | { | 3874 | { |
3878 | 3875 | ||
3879 | switch (Pack.Type) | 3876 | switch (Pack.Type) |
3880 | { | 3877 | { |
3881 | #region Scene/Avatar | 3878 | #region Scene/Avatar |
@@ -5427,10 +5424,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5427 | } | 5424 | } |
5428 | break; | 5425 | break; |
5429 | case PacketType.ParcelReturnObjects: | 5426 | case PacketType.ParcelReturnObjects: |
5430 | 5427 | ||
5431 | 5428 | ||
5432 | ParcelReturnObjectsPacket parcelReturnObjects = (ParcelReturnObjectsPacket)Pack; | 5429 | ParcelReturnObjectsPacket parcelReturnObjects = (ParcelReturnObjectsPacket)Pack; |
5433 | 5430 | ||
5434 | LLUUID[] puserselectedOwnerIDs = new LLUUID[parcelReturnObjects.OwnerIDs.Length]; | 5431 | LLUUID[] puserselectedOwnerIDs = new LLUUID[parcelReturnObjects.OwnerIDs.Length]; |
5435 | for (int parceliterator = 0; parceliterator < parcelReturnObjects.OwnerIDs.Length; parceliterator++) | 5432 | for (int parceliterator = 0; parceliterator < parcelReturnObjects.OwnerIDs.Length; parceliterator++) |
5436 | puserselectedOwnerIDs[parceliterator] = parcelReturnObjects.OwnerIDs[parceliterator].OwnerID; | 5433 | puserselectedOwnerIDs[parceliterator] = parcelReturnObjects.OwnerIDs[parceliterator].OwnerID; |
@@ -5444,10 +5441,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5444 | if (handlerParcelReturnObjectsRequest != null) | 5441 | if (handlerParcelReturnObjectsRequest != null) |
5445 | { | 5442 | { |
5446 | handlerParcelReturnObjectsRequest(parcelReturnObjects.ParcelData.LocalID,parcelReturnObjects.ParcelData.ReturnType,puserselectedOwnerIDs,puserselectedTaskIDs, this); | 5443 | handlerParcelReturnObjectsRequest(parcelReturnObjects.ParcelData.LocalID,parcelReturnObjects.ParcelData.ReturnType,puserselectedOwnerIDs,puserselectedTaskIDs, this); |
5447 | 5444 | ||
5448 | } | 5445 | } |
5449 | break; | 5446 | break; |
5450 | 5447 | ||
5451 | #endregion | 5448 | #endregion |
5452 | 5449 | ||
5453 | #region Estate Packets | 5450 | #region Estate Packets |
@@ -5666,7 +5663,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5666 | break; | 5663 | break; |
5667 | case PacketType.LandStatRequest: | 5664 | case PacketType.LandStatRequest: |
5668 | LandStatRequestPacket lsrp = (LandStatRequestPacket)Pack; | 5665 | LandStatRequestPacket lsrp = (LandStatRequestPacket)Pack; |
5669 | 5666 | ||
5670 | handlerLandStatRequest = OnLandStatRequest; | 5667 | handlerLandStatRequest = OnLandStatRequest; |
5671 | if (handlerLandStatRequest != null) | 5668 | if (handlerLandStatRequest != null) |
5672 | { | 5669 | { |
@@ -5678,7 +5675,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5678 | //lsrp.RequestData.ReportType; // 1 = colliders, 0 = scripts | 5675 | //lsrp.RequestData.ReportType; // 1 = colliders, 0 = scripts |
5679 | //lsrp.RequestData.RequestFlags; | 5676 | //lsrp.RequestData.RequestFlags; |
5680 | //lsrp.RequestData.Filter; | 5677 | //lsrp.RequestData.Filter; |
5681 | 5678 | ||
5682 | break; | 5679 | break; |
5683 | 5680 | ||
5684 | case PacketType.RequestRegionInfo: | 5681 | case PacketType.RequestRegionInfo: |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index fb14a35..3786489 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
40 | { | 40 | { |
41 | public class LLPacketQueue : IPullStatsProvider | 41 | public class LLPacketQueue : IPullStatsProvider |
42 | { | 42 | { |
43 | private static readonly log4net.ILog m_log | 43 | private static readonly log4net.ILog m_log |
44 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 44 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private bool m_enabled = true; | 46 | private bool m_enabled = true; |
@@ -424,7 +424,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
424 | m_log.Warn("[PACKET QUEUE]: SetThrottleFromClient unexpectedly received a throttle byte array containing no elements!"); | 424 | m_log.Warn("[PACKET QUEUE]: SetThrottleFromClient unexpectedly received a throttle byte array containing no elements!"); |
425 | return; | 425 | return; |
426 | } | 426 | } |
427 | 427 | ||
428 | int tResend = -1; | 428 | int tResend = -1; |
429 | int tLand = -1; | 429 | int tLand = -1; |
430 | int tWind = -1; | 430 | int tWind = -1; |