aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorlbsa712007-09-14 13:46:05 +0000
committerlbsa712007-09-14 13:46:05 +0000
commitf8ddf7429eaeae3a3aae88d4560473c3516d20fd (patch)
tree91b92e54331971c6162636ade1f7c0b6b91f3afe /OpenSim/Region/ClientStack
parent* fixed script compilation (diff)
downloadopensim-SC_OLD-f8ddf7429eaeae3a3aae88d4560473c3516d20fd.zip
opensim-SC_OLD-f8ddf7429eaeae3a3aae88d4560473c3516d20fd.tar.gz
opensim-SC_OLD-f8ddf7429eaeae3a3aae88d4560473c3516d20fd.tar.bz2
opensim-SC_OLD-f8ddf7429eaeae3a3aae88d4560473c3516d20fd.tar.xz
* Wired up chat so that channel goes into OnChatFromViewer. However:
* There's no libsl reply packet field for it, I guess other channels than 0 makes no sense sending back to clients. * We do not currently support objects listening, so there's really no way of actually using this feature. So; somebody please wire chat all the way to the scripts.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs9
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs5
2 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 031e50a..c97ba37 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -243,14 +243,7 @@ namespace OpenSim.Region.ClientStack
243 SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID); 243 SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID);
244 } 244 }
245 245
246 /// <summary> 246
247 ///
248 /// </summary>
249 /// <param name="message"></param>
250 /// <param name="type"></param>
251 /// <param name="fromPos"></param>
252 /// <param name="fromName"></param>
253 /// <param name="fromAgentID"></param>
254 public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) 247 public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
255 { 248 {
256 Encoding enc = Encoding.ASCII; 249 Encoding enc = Encoding.ASCII;
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index fab5433..fe3e82c 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -107,9 +107,12 @@ namespace OpenSim.Region.ClientStack
107 byte type = inchatpack.ChatData.Type; 107 byte type = inchatpack.ChatData.Type;
108 LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos; 108 LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;
109 LLUUID fromAgentID = AgentID; 109 LLUUID fromAgentID = AgentID;
110
111 int channel = inchatpack.ChatData.Channel;
112
110 if (OnChatFromViewer != null) 113 if (OnChatFromViewer != null)
111 { 114 {
112 this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID); 115 this.OnChatFromViewer(message, type, channel, fromPos, fromName, fromAgentID);
113 } 116 }
114 break; 117 break;
115 case PacketType.ImprovedInstantMessage: 118 case PacketType.ImprovedInstantMessage: