aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs16
1 files changed, 4 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f246637..1d4be8a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -525,7 +525,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
525 525
526 public void Kick(string message) 526 public void Kick(string message)
527 { 527 {
528 if (!ChildAgentStatus()) 528 if (!SceneAgent.IsChildAgent)
529 { 529 {
530 KickUserPacket kupack = (KickUserPacket)PacketPool.Instance.GetPacket(PacketType.KickUser); 530 KickUserPacket kupack = (KickUserPacket)PacketPool.Instance.GetPacket(PacketType.KickUser);
531 kupack.UserInfo.AgentID = AgentId; 531 kupack.UserInfo.AgentID = AgentId;
@@ -2448,7 +2448,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2448 /// <param name="Message"></param> 2448 /// <param name="Message"></param>
2449 public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message) 2449 public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message)
2450 { 2450 {
2451 if (!ChildAgentStatus()) 2451 if (!SceneAgent.IsChildAgent)
2452 SendInstantMessage(new GridInstantMessage(null, FromAvatarID, FromAvatarName, AgentId, 1, Message, false, new Vector3())); 2452 SendInstantMessage(new GridInstantMessage(null, FromAvatarID, FromAvatarName, AgentId, 1, Message, false, new Vector3()));
2453 2453
2454 //SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, (byte)21,(uint) Util.UnixTimeSinceEpoch()); 2454 //SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, (byte)21,(uint) Util.UnixTimeSinceEpoch());
@@ -5054,14 +5054,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5054 return 0; 5054 return 0;
5055 } 5055 }
5056 5056
5057 /// <summary>
5058 /// This is a utility method used by single states to not duplicate kicks and blue card of death messages.
5059 /// </summary>
5060 public bool ChildAgentStatus()
5061 {
5062 return m_scene.PresenceChildStatus(AgentId);
5063 }
5064
5065 #endregion 5057 #endregion
5066 5058
5067 /// <summary> 5059 /// <summary>
@@ -11625,7 +11617,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11625 if (logPacket) 11617 if (logPacket)
11626 m_log.DebugFormat( 11618 m_log.DebugFormat(
11627 "[CLIENT]: PACKET OUT to {0} ({1}) in {2} - {3}", 11619 "[CLIENT]: PACKET OUT to {0} ({1}) in {2} - {3}",
11628 Name, ChildAgentStatus() ? "child" : "root ", m_scene.RegionInfo.RegionName, packet.Type); 11620 Name, SceneAgent.IsChildAgent ? "child" : "root ", m_scene.RegionInfo.RegionName, packet.Type);
11629 } 11621 }
11630 11622
11631 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting, method); 11623 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting, method);
@@ -11682,7 +11674,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11682 if (logPacket) 11674 if (logPacket)
11683 m_log.DebugFormat( 11675 m_log.DebugFormat(
11684 "[CLIENT]: PACKET IN from {0} ({1}) in {2} - {3}", 11676 "[CLIENT]: PACKET IN from {0} ({1}) in {2} - {3}",
11685 Name, ChildAgentStatus() ? "child" : "root ", m_scene.RegionInfo.RegionName, packet.Type); 11677 Name, SceneAgent.IsChildAgent ? "child" : "root ", m_scene.RegionInfo.RegionName, packet.Type);
11686 } 11678 }
11687 11679
11688 if (!ProcessPacketMethod(packet)) 11680 if (!ProcessPacketMethod(packet))