Allow callers to set the invoice parameter for GenericMessage
parent
4aa6f2bbba
commit
6571e7ead2
|
@ -1129,8 +1129,8 @@ namespace OpenSim.Framework
|
|||
|
||||
void SendInstantMessage(GridInstantMessage im);
|
||||
|
||||
void SendGenericMessage(string method, List<string> message);
|
||||
void SendGenericMessage(string method, List<byte[]> message);
|
||||
void SendGenericMessage(string method, UUID invoice, List<string> message);
|
||||
void SendGenericMessage(string method, UUID invoice, List<byte[]> message);
|
||||
|
||||
void SendLayerData(float[] map);
|
||||
void SendLayerData(int px, int py, float[] map);
|
||||
|
|
|
@ -903,9 +903,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
}
|
||||
}
|
||||
|
||||
public void SendGenericMessage(string method, List<string> message)
|
||||
public void SendGenericMessage(string method, UUID invoice, List<string> message)
|
||||
{
|
||||
GenericMessagePacket gmp = new GenericMessagePacket();
|
||||
|
||||
gmp.AgentData.AgentID = AgentId;
|
||||
gmp.AgentData.SessionID = m_sessionId;
|
||||
gmp.AgentData.TransactionID = invoice;
|
||||
|
||||
gmp.MethodData.Method = Util.StringToBytes256(method);
|
||||
gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
|
||||
int i = 0;
|
||||
|
@ -918,9 +923,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
OutPacket(gmp, ThrottleOutPacketType.Task);
|
||||
}
|
||||
|
||||
public void SendGenericMessage(string method, List<byte[]> message)
|
||||
public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
|
||||
{
|
||||
GenericMessagePacket gmp = new GenericMessagePacket();
|
||||
|
||||
gmp.AgentData.AgentID = AgentId;
|
||||
gmp.AgentData.SessionID = m_sessionId;
|
||||
gmp.AgentData.TransactionID = invoice;
|
||||
|
||||
gmp.MethodData.Method = Util.StringToBytes256(method);
|
||||
gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
|
||||
int i = 0;
|
||||
|
|
|
@ -198,12 +198,12 @@ namespace OpenSim.Region.CoreModules.World.LightShare
|
|||
if (m_scene.RegionInfo.WindlightSettings.valid)
|
||||
{
|
||||
List<byte[]> param = compileWindlightSettings(wl);
|
||||
client.SendGenericMessage("Windlight", param);
|
||||
client.SendGenericMessage("Windlight", UUID.Random(), param);
|
||||
}
|
||||
else
|
||||
{
|
||||
List<byte[]> param = new List<byte[]>();
|
||||
client.SendGenericMessage("WindlightReset", param);
|
||||
client.SendGenericMessage("WindlightReset", UUID.Random(), param);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -976,12 +976,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
|
|||
// TODO
|
||||
}
|
||||
|
||||
public void SendGenericMessage(string method, List<string> message)
|
||||
public void SendGenericMessage(string method, UUID invoice, List<string> message)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void SendGenericMessage(string method, List<byte[]> message)
|
||||
public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
|
||||
{
|
||||
|
||||
}
|
||||
|
|
|
@ -630,12 +630,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
|||
|
||||
}
|
||||
|
||||
public void SendGenericMessage(string method, List<string> message)
|
||||
public void SendGenericMessage(string method, UUID invoice, List<string> message)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void SendGenericMessage(string method, List<byte[]> message)
|
||||
public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
|
||||
{
|
||||
|
||||
}
|
||||
|
|
|
@ -550,12 +550,12 @@ namespace OpenSim.Tests.Common.Mock
|
|||
|
||||
}
|
||||
|
||||
public void SendGenericMessage(string method, List<string> message)
|
||||
public void SendGenericMessage(string method, UUID invoice, List<string> message)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void SendGenericMessage(string method, List<byte[]> message)
|
||||
public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
|
||||
{
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue