aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/FunSLUDP
diff options
context:
space:
mode:
authorJeff Ames2008-08-07 12:55:46 +0000
committerJeff Ames2008-08-07 12:55:46 +0000
commit0718aa0b7fd7cb3bb42d36b37f79d8d6cfc725bc (patch)
treeba6b41e2e10e717ed8743a035c10849db2f0cb14 /OpenSim/Region/ClientStack/FunSLUDP
parentUpdate svn properties. (diff)
downloadopensim-SC-0718aa0b7fd7cb3bb42d36b37f79d8d6cfc725bc.zip
opensim-SC-0718aa0b7fd7cb3bb42d36b37f79d8d6cfc725bc.tar.gz
opensim-SC-0718aa0b7fd7cb3bb42d36b37f79d8d6cfc725bc.tar.bz2
opensim-SC-0718aa0b7fd7cb3bb42d36b37f79d8d6cfc725bc.tar.xz
Minor formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs16
-rw-r--r--OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs12
2 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs b/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs
index a984173..1e73152 100644
--- a/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
115 protected LLUUID m_activeGroupID = LLUUID.Zero; 115 protected LLUUID m_activeGroupID = LLUUID.Zero;
116 protected string m_activeGroupName = String.Empty; 116 protected string m_activeGroupName = String.Empty;
117 protected ulong m_activeGroupPowers = 0; 117 protected ulong m_activeGroupPowers = 0;
118 protected Dictionary<LLUUID,ulong> m_groupPowers = new Dictionary<LLUUID, ulong>(); 118 protected Dictionary<LLUUID,ulong> m_groupPowers = new Dictionary<LLUUID, ulong>();
119 119
120 /* Instantiated Designated Event Delegates */ 120 /* Instantiated Designated Event Delegates */
121 //- used so we don't create new objects for each incoming packet and then toss it out later */ 121 //- used so we don't create new objects for each incoming packet and then toss it out later */
@@ -293,12 +293,12 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
293 get { return m_activeGroupPowers; } 293 get { return m_activeGroupPowers; }
294 } 294 }
295 295
296 public ulong GetGroupPowers(LLUUID groupID) 296 public ulong GetGroupPowers(LLUUID groupID)
297 { 297 {
298 if(m_groupPowers.ContainsKey(groupID)) 298 if (m_groupPowers.ContainsKey(groupID))
299 return m_groupPowers[groupID]; 299 return m_groupPowers[groupID];
300 return 0; 300 return 0;
301 } 301 }
302 302
303 /// <summary> 303 /// <summary>
304 /// This is a utility method used by single states to not duplicate kicks and blue card of death messages. 304 /// This is a utility method used by single states to not duplicate kicks and blue card of death messages.
@@ -6291,7 +6291,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
6291 packet.ObjectData.ObjectID = objectID; 6291 packet.ObjectData.ObjectID = objectID;
6292 SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count]; 6292 SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count];
6293 uint idx = 0; 6293 uint idx = 0;
6294 foreach(KeyValuePair<int, float> pair in parameters) 6294 foreach (KeyValuePair<int, float> pair in parameters)
6295 { 6295 {
6296 SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock(); 6296 SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock();
6297 block.Type = pair.Key; 6297 block.Type = pair.Key;
diff --git a/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs
index 3a0d937..342dd5c 100644
--- a/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs
@@ -248,12 +248,12 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
248 248
249 private void AddAcks(ref Packet packet) 249 private void AddAcks(ref Packet packet)
250 { 250 {
251 // This packet type has shown to have issues with 251 // This packet type has shown to have issues with
252 // acks being appended to the payload, just don't send 252 // acks being appended to the payload, just don't send
253 // any with this packet type until libsl is fixed. 253 // any with this packet type until libsl is fixed.
254 // 254 //
255 if(packet is libsecondlife.Packets.ViewerEffectPacket) 255 if (packet is libsecondlife.Packets.ViewerEffectPacket)
256 return; 256 return;
257 257
258 // Add acks to outgoing packets 258 // Add acks to outgoing packets
259 // 259 //