diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 16 |
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 af68de6..ace4444 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -548,7 +548,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
548 | 548 | ||
549 | public void Kick(string message) | 549 | public void Kick(string message) |
550 | { | 550 | { |
551 | if (!ChildAgentStatus()) | 551 | if (!SceneAgent.IsChildAgent) |
552 | { | 552 | { |
553 | KickUserPacket kupack = (KickUserPacket)PacketPool.Instance.GetPacket(PacketType.KickUser); | 553 | KickUserPacket kupack = (KickUserPacket)PacketPool.Instance.GetPacket(PacketType.KickUser); |
554 | kupack.UserInfo.AgentID = AgentId; | 554 | kupack.UserInfo.AgentID = AgentId; |
@@ -2465,7 +2465,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2465 | /// <param name="Message"></param> | 2465 | /// <param name="Message"></param> |
2466 | public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message) | 2466 | public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message) |
2467 | { | 2467 | { |
2468 | if (!ChildAgentStatus()) | 2468 | if (!SceneAgent.IsChildAgent) |
2469 | SendInstantMessage(new GridInstantMessage(null, FromAvatarID, FromAvatarName, AgentId, 1, Message, false, new Vector3())); | 2469 | SendInstantMessage(new GridInstantMessage(null, FromAvatarID, FromAvatarName, AgentId, 1, Message, false, new Vector3())); |
2470 | 2470 | ||
2471 | //SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, (byte)21,(uint) Util.UnixTimeSinceEpoch()); | 2471 | //SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, (byte)21,(uint) Util.UnixTimeSinceEpoch()); |
@@ -5112,14 +5112,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5112 | return 0; | 5112 | return 0; |
5113 | } | 5113 | } |
5114 | 5114 | ||
5115 | /// <summary> | ||
5116 | /// This is a utility method used by single states to not duplicate kicks and blue card of death messages. | ||
5117 | /// </summary> | ||
5118 | public bool ChildAgentStatus() | ||
5119 | { | ||
5120 | return m_scene.PresenceChildStatus(AgentId); | ||
5121 | } | ||
5122 | |||
5123 | #endregion | 5115 | #endregion |
5124 | 5116 | ||
5125 | /// <summary> | 5117 | /// <summary> |
@@ -11750,7 +11742,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11750 | if (logPacket) | 11742 | if (logPacket) |
11751 | m_log.DebugFormat( | 11743 | m_log.DebugFormat( |
11752 | "[CLIENT]: PACKET OUT to {0} ({1}) in {2} - {3}", | 11744 | "[CLIENT]: PACKET OUT to {0} ({1}) in {2} - {3}", |
11753 | Name, ChildAgentStatus() ? "child" : "root ", m_scene.RegionInfo.RegionName, packet.Type); | 11745 | Name, SceneAgent.IsChildAgent ? "child" : "root ", m_scene.RegionInfo.RegionName, packet.Type); |
11754 | } | 11746 | } |
11755 | 11747 | ||
11756 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting, method); | 11748 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting, method); |
@@ -11807,7 +11799,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11807 | if (logPacket) | 11799 | if (logPacket) |
11808 | m_log.DebugFormat( | 11800 | m_log.DebugFormat( |
11809 | "[CLIENT]: PACKET IN from {0} ({1}) in {2} - {3}", | 11801 | "[CLIENT]: PACKET IN from {0} ({1}) in {2} - {3}", |
11810 | Name, ChildAgentStatus() ? "child" : "root ", m_scene.RegionInfo.RegionName, packet.Type); | 11802 | Name, SceneAgent.IsChildAgent ? "child" : "root ", m_scene.RegionInfo.RegionName, packet.Type); |
11811 | } | 11803 | } |
11812 | 11804 | ||
11813 | if (!ProcessPacketMethod(packet)) | 11805 | if (!ProcessPacketMethod(packet)) |