add missing part of mutes list protocol
parent
d35ab8c86c
commit
2f13b68d4f
|
@ -1485,7 +1485,7 @@ namespace OpenSim.Framework
|
||||||
void SendUserInfoReply(bool imViaEmail, bool visible, string email);
|
void SendUserInfoReply(bool imViaEmail, bool visible, string email);
|
||||||
|
|
||||||
void SendUseCachedMuteList();
|
void SendUseCachedMuteList();
|
||||||
|
void SendEmpytMuteList();
|
||||||
void SendMuteListUpdate(string filename);
|
void SendMuteListUpdate(string filename);
|
||||||
|
|
||||||
void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
|
void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
|
||||||
|
|
|
@ -2307,11 +2307,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
OutPacket(remove, ThrottleOutPacketType.Asset);
|
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)
|
public void SendTakeControls(int controls, bool passToAgent, bool TakeControls)
|
||||||
{
|
{
|
||||||
ScriptControlChangePacket scriptcontrol = (ScriptControlChangePacket)PacketPool.Instance.GetPacket(PacketType.ScriptControlChange);
|
ScriptControlChangePacket scriptcontrol = (ScriptControlChangePacket)PacketPool.Instance.GetPacket(PacketType.ScriptControlChange);
|
||||||
ScriptControlChangePacket.DataBlock[] data = new ScriptControlChangePacket.DataBlock[1];
|
ScriptControlChangePacket.DataBlock[] data = new ScriptControlChangePacket.DataBlock[1];
|
||||||
ScriptControlChangePacket.DataBlock ddata = new ScriptControlChangePacket.DataBlock();
|
ScriptControlChangePacket.DataBlock ddata = new ScriptControlChangePacket.DataBlock();
|
||||||
|
// ddata.Controls = adjustControls(controls);
|
||||||
ddata.Controls = (uint)controls;
|
ddata.Controls = (uint)controls;
|
||||||
ddata.PassToAgent = passToAgent;
|
ddata.PassToAgent = passToAgent;
|
||||||
ddata.TakeControls = TakeControls;
|
ddata.TakeControls = TakeControls;
|
||||||
|
@ -3762,6 +3774,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
OutPacket(useCachedMuteList, ThrottleOutPacketType.Task);
|
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)
|
public void SendMuteListUpdate(string filename)
|
||||||
{
|
{
|
||||||
MuteListUpdatePacket muteListUpdate = (MuteListUpdatePacket)PacketPool.Instance.GetPacket(PacketType.MuteListUpdate);
|
MuteListUpdatePacket muteListUpdate = (MuteListUpdatePacket)PacketPool.Instance.GetPacket(PacketType.MuteListUpdate);
|
||||||
|
@ -11008,7 +11036,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SendUseCachedMuteList();
|
if(muteListRequest.MuteData.MuteCRC == 0)
|
||||||
|
SendEmpytMuteList();
|
||||||
|
else
|
||||||
|
SendUseCachedMuteList();
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1702,6 +1702,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SendEmpytMuteList()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
public void SendMuteListUpdate(string filename)
|
public void SendMuteListUpdate(string filename)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -1314,6 +1314,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SendEmpytMuteList()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
public void SendMuteListUpdate(string filename)
|
public void SendMuteListUpdate(string filename)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -1315,6 +1315,10 @@ namespace OpenSim.Tests.Common
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SendEmpytMuteList()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
public void SendMuteListUpdate(string filename)
|
public void SendMuteListUpdate(string filename)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue