OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add missing part of mutes list protocol

0.9.0.1-postfixes
UbitUmarov 2017-11-16 17:50:06 +00:00
parent d35ab8c86c
commit 2f13b68d4f
5 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/IClientAPI.cs
View File

@ -1485,7 +1485,7 @@ namespace OpenSim.Framework
void SendUserInfoReply(bool imViaEmail, bool visible, string email);
void SendUseCachedMuteList();
void SendEmpytMuteList();
void SendMuteListUpdate(string filename);
void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);

35
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -2307,11 +2307,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(remove, ThrottleOutPacketType.Asset);
}
/*
private uint adjustControls(int input)
{
uint ret = (uint)input;
uint masked = ret & 0x0f;
masked <<= 19;
ret |= masked;
return ret;
}
*/
public void SendTakeControls(int controls, bool passToAgent, bool TakeControls)
{
ScriptControlChangePacket scriptcontrol = (ScriptControlChangePacket)PacketPool.Instance.GetPacket(PacketType.ScriptControlChange);
ScriptControlChangePacket.DataBlock[] data = new ScriptControlChangePacket.DataBlock[1];
ScriptControlChangePacket.DataBlock ddata = new ScriptControlChangePacket.DataBlock();
// ddata.Controls = adjustControls(controls);
ddata.Controls = (uint)controls;
ddata.PassToAgent = passToAgent;
ddata.TakeControls = TakeControls;
@ -3762,6 +3774,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(useCachedMuteList, ThrottleOutPacketType.Task);
}
public void SendEmpytMuteList()
{
GenericMessagePacket gmp = new GenericMessagePacket();
gmp.AgentData.AgentID = AgentId;
gmp.AgentData.SessionID = m_sessionId;
gmp.AgentData.TransactionID = UUID.Zero;
gmp.MethodData.Method = Util.StringToBytes256("emptymutelist");
gmp.ParamList = new GenericMessagePacket.ParamListBlock[1];
gmp.ParamList[0] = new GenericMessagePacket.ParamListBlock();
gmp.ParamList[0].Parameter = new byte[0];
OutPacket(gmp, ThrottleOutPacketType.Task);
}
public void SendMuteListUpdate(string filename)
{
MuteListUpdatePacket muteListUpdate = (MuteListUpdatePacket)PacketPool.Instance.GetPacket(PacketType.MuteListUpdate);
@ -11008,9 +11036,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
else
{
SendUseCachedMuteList();
if(muteListRequest.MuteData.MuteCRC == 0)
SendEmpytMuteList();
else
SendUseCachedMuteList();
}
return true;
return true;
}
private bool HandleUpdateMuteListEntry(IClientAPI client, Packet Packet)

5
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -1702,6 +1702,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public void SendEmpytMuteList()
{
}
public void SendMuteListUpdate(string filename)
{

4
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -1314,6 +1314,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{
}
public void SendEmpytMuteList()
{
}
public void SendMuteListUpdate(string filename)
{
}

4
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -1315,6 +1315,10 @@ namespace OpenSim.Tests.Common
{
}
public void SendEmpytMuteList()
{
}
public void SendMuteListUpdate(string filename)
{
}