aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
diff options
context:
space:
mode:
authorMW2007-08-20 11:52:55 +0000
committerMW2007-08-20 11:52:55 +0000
commit4af33c4da6774363db0d442f81b4871718cc5f2e (patch)
tree76793256cd683b45c81e7a28bbd33ffe70cf72bc /OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
parentSome minor changes + krinkec's updates to ll* functions. (diff)
downloadopensim-SC_OLD-4af33c4da6774363db0d442f81b4871718cc5f2e.zip
opensim-SC_OLD-4af33c4da6774363db0d442f81b4871718cc5f2e.tar.gz
opensim-SC_OLD-4af33c4da6774363db0d442f81b4871718cc5f2e.tar.bz2
opensim-SC_OLD-4af33c4da6774363db0d442f81b4871718cc5f2e.tar.xz
Instant Messages between users in the same region should actually now work.
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index a6cb281..903ddcc 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -121,14 +121,12 @@ namespace OpenSim.Region.ClientStack
121 break; 121 break;
122 case PacketType.ImprovedInstantMessage: 122 case PacketType.ImprovedInstantMessage:
123 ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack; 123 ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack;
124
125 string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName); 124 string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName);
126 string IMmessage = Util.FieldToString(msgpack.MessageBlock.Message); 125 string IMmessage = Util.FieldToString(msgpack.MessageBlock.Message);
127
128 if (OnInstantMessage != null) 126 if (OnInstantMessage != null)
129 { 127 {
130 this.OnInstantMessage(msgpack.AgentData.AgentID, msgpack.MessageBlock.ToAgentID, 128 this.OnInstantMessage(msgpack.AgentData.AgentID, msgpack.AgentData.SessionID, msgpack.MessageBlock.ToAgentID, msgpack.MessageBlock.ID,
131 msgpack.MessageBlock.Timestamp, IMfromName, IMmessage); 129 msgpack.MessageBlock.Timestamp, IMfromName, IMmessage, msgpack.MessageBlock.Dialog);
132 } 130 }
133 break; 131 break;
134 case PacketType.RezObject: 132 case PacketType.RezObject:
@@ -235,7 +233,6 @@ namespace OpenSim.Region.ClientStack
235 { 233 {
236 ObjectAddPacket addPacket = (ObjectAddPacket)Pack; 234 ObjectAddPacket addPacket = (ObjectAddPacket)Pack;
237 PrimitiveBaseShape shape = GetShapeFromAddPacket(addPacket); 235 PrimitiveBaseShape shape = GetShapeFromAddPacket(addPacket);
238
239 OnAddPrim(this.AgentId, addPacket.ObjectData.RayEnd, shape); 236 OnAddPrim(this.AgentId, addPacket.ObjectData.RayEnd, shape);
240 } 237 }
241 break; 238 break;
@@ -460,9 +457,12 @@ namespace OpenSim.Region.ClientStack
460 } 457 }
461 break; 458 break;
462 case PacketType.UpdateTaskInventory: 459 case PacketType.UpdateTaskInventory:
463 // Console.WriteLine(Pack.ToString()); 460 //Console.WriteLine(Pack.ToString());
464 UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack; 461 UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
465 break; 462 break;
463 case PacketType.RezScript:
464 //Console.WriteLine(Pack.ToString());
465 break;
466 case PacketType.MapLayerRequest: 466 case PacketType.MapLayerRequest:
467 this.RequestMapLayer(); 467 this.RequestMapLayer();
468 break; 468 break;