aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs6
-rw-r--r--OpenSim/Region/ClientStack/ClientView.PacketQueue.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs4
4 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 1597cc5..83b4cbc 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -382,7 +382,7 @@ namespace OpenSim.Region.ClientStack
382 newSimPack.Info = new CrossedRegionPacket.InfoBlock(); 382 newSimPack.Info = new CrossedRegionPacket.InfoBlock();
383 newSimPack.Info.Position = pos; 383 newSimPack.Info.Position = pos;
384 newSimPack.Info.LookAt = look; 384 newSimPack.Info.LookAt = look;
385 // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!! 385 // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
386 newSimPack.RegionData = new CrossedRegionPacket.RegionDataBlock(); 386 newSimPack.RegionData = new CrossedRegionPacket.RegionDataBlock();
387 newSimPack.RegionData.RegionHandle = newRegionHandle; 387 newSimPack.RegionData.RegionHandle = newRegionHandle;
388 byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes(); 388 byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes();
@@ -847,7 +847,7 @@ namespace OpenSim.Region.ClientStack
847 { 847 {
848 AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket(); 848 AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
849 aw.AgentData.AgentID = AgentId; 849 aw.AgentData.AgentID = AgentId;
850 aw.AgentData.SerialNum = (uint)serial; 850 aw.AgentData.SerialNum = (uint) serial;
851 aw.AgentData.SessionID = m_sessionId; 851 aw.AgentData.SessionID = m_sessionId;
852 852
853 aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13]; 853 aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
@@ -1296,7 +1296,7 @@ namespace OpenSim.Region.ClientStack
1296 protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry) 1296 protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)
1297 { 1297 {
1298 ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); 1298 ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock();
1299 // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i); 1299 // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
1300 1300
1301 SetDefaultAvatarPacketValues(ref objdata); 1301 SetDefaultAvatarPacketValues(ref objdata);
1302 objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24); 1302 objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
index 2678a98..dc7952e 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ClientStack
152 else 152 else
153 { 153 {
154 m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, m_circuitCode); 154 m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, m_circuitCode);
155 //userEP); 155 //userEP);
156 } 156 }
157 } 157 }
158 catch (Exception) 158 catch (Exception)
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 1e14587..7c1a663 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -202,7 +202,7 @@ namespace OpenSim.Region.ClientStack
202 case PacketType.AgentRequestSit: 202 case PacketType.AgentRequestSit:
203 if (OnAgentRequestSit != null) 203 if (OnAgentRequestSit != null)
204 { 204 {
205 AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket)Pack; 205 AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket) Pack;
206 OnAgentRequestSit(this, agentRequestSit.AgentData.AgentID, 206 OnAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
207 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); 207 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
208 } 208 }
@@ -770,4 +770,4 @@ namespace OpenSim.Region.ClientStack
770 OutPacket(logReply); 770 OutPacket(logReply);
771 } 771 }
772 } 772 }
773} 773} \ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 730c199..0e35488 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.ClientStack
54 new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients 54 new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
55 55
56 protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); 56 protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>();
57 //local handlers for this instance 57 //local handlers for this instance
58 58
59 private LLUUID m_sessionId; 59 private LLUUID m_sessionId;
60 public LLUUID SecureSessionID = LLUUID.Zero; 60 public LLUUID SecureSessionID = LLUUID.Zero;
@@ -203,7 +203,7 @@ namespace OpenSim.Region.ClientStack
203 { 203 {
204 if (debug > 0) 204 if (debug > 0)
205 { 205 {
206 string info= ""; 206 string info = "";
207 if (debug < 255 && packet.Type == PacketType.AgentUpdate) 207 if (debug < 255 && packet.Type == PacketType.AgentUpdate)
208 return; 208 return;
209 if (debug < 254 && packet.Type == PacketType.ViewerEffect) 209 if (debug < 254 && packet.Type == PacketType.ViewerEffect)