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

Allow callers to set the invoice parameter for GenericMessage

avinationmerge
Melanie 2013-04-22 22:24:41 +02:00
parent 4aa6f2bbba
commit 6571e7ead2
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/IClientAPI.cs
View File

@ -1129,8 +1129,8 @@ namespace OpenSim.Framework
void SendInstantMessage(GridInstantMessage im); void SendInstantMessage(GridInstantMessage im);
void SendGenericMessage(string method, List<string> message); void SendGenericMessage(string method, UUID invoice, List<string> message);
void SendGenericMessage(string method, List<byte[]> message); void SendGenericMessage(string method, UUID invoice, List<byte[]> message);
void SendLayerData(float[] map); void SendLayerData(float[] map);
void SendLayerData(int px, int py, float[] map); void SendLayerData(int px, int py, float[] map);

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

@ -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(); GenericMessagePacket gmp = new GenericMessagePacket();
gmp.AgentData.AgentID = AgentId;
gmp.AgentData.SessionID = m_sessionId;
gmp.AgentData.TransactionID = invoice;
gmp.MethodData.Method = Util.StringToBytes256(method); gmp.MethodData.Method = Util.StringToBytes256(method);
gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count]; gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
int i = 0; int i = 0;
@ -918,9 +923,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(gmp, ThrottleOutPacketType.Task); 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(); GenericMessagePacket gmp = new GenericMessagePacket();
gmp.AgentData.AgentID = AgentId;
gmp.AgentData.SessionID = m_sessionId;
gmp.AgentData.TransactionID = invoice;
gmp.MethodData.Method = Util.StringToBytes256(method); gmp.MethodData.Method = Util.StringToBytes256(method);
gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count]; gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
int i = 0; int i = 0;

4
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
View File

@ -198,12 +198,12 @@ namespace OpenSim.Region.CoreModules.World.LightShare
if (m_scene.RegionInfo.WindlightSettings.valid) if (m_scene.RegionInfo.WindlightSettings.valid)
{ {
List<byte[]> param = compileWindlightSettings(wl); List<byte[]> param = compileWindlightSettings(wl);
client.SendGenericMessage("Windlight", param); client.SendGenericMessage("Windlight", UUID.Random(), param);
} }
else else
{ {
List<byte[]> param = new List<byte[]>(); List<byte[]> param = new List<byte[]>();
client.SendGenericMessage("WindlightReset", param); client.SendGenericMessage("WindlightReset", UUID.Random(), param);
} }
} }
} }

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

@ -976,12 +976,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
// TODO // 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)
{ {
} }

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

@ -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)
{ {
} }

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

@ -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)
{ {
} }