diff options
author | Jeff Ames | 2007-11-08 07:14:46 +0000 |
---|---|---|
committer | Jeff Ames | 2007-11-08 07:14:46 +0000 |
commit | fc3e247956d11b9e28a1ec0654eb4a7e92d7c91b (patch) | |
tree | f632e29ecfcc938ca56e81b3b27fc0e1ebe418aa /OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |
parent | converted hard-coded chat type values to ChatTypeEnum (diff) | |
download | opensim-SC_OLD-fc3e247956d11b9e28a1ec0654eb4a7e92d7c91b.zip opensim-SC_OLD-fc3e247956d11b9e28a1ec0654eb4a7e92d7c91b.tar.gz opensim-SC_OLD-fc3e247956d11b9e28a1ec0654eb4a7e92d7c91b.tar.bz2 opensim-SC_OLD-fc3e247956d11b9e28a1ec0654eb4a7e92d7c91b.tar.xz |
fixed non-ASCII chat and IM
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index 7a778e8..d285d21 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Region.ClientStack | |||
83 | break; | 83 | break; |
84 | case PacketType.ChatFromViewer: | 84 | case PacketType.ChatFromViewer: |
85 | ChatFromViewerPacket inchatpack = (ChatFromViewerPacket) Pack; | 85 | ChatFromViewerPacket inchatpack = (ChatFromViewerPacket) Pack; |
86 | if (Util.FieldToString(inchatpack.ChatData.Message) == "") | 86 | if (Helpers.FieldToUTF8String(inchatpack.ChatData.Message) == "") |
87 | { | 87 | { |
88 | //empty message so don't bother with it | 88 | //empty message so don't bother with it |
89 | break; | 89 | break; |
@@ -101,7 +101,7 @@ namespace OpenSim.Region.ClientStack | |||
101 | ChatFromViewerArgs args = new ChatFromViewerArgs(); | 101 | ChatFromViewerArgs args = new ChatFromViewerArgs(); |
102 | args.Channel = channel; | 102 | args.Channel = channel; |
103 | args.From = fromName; | 103 | args.From = fromName; |
104 | args.Message = Util.FieldToString(message); | 104 | args.Message = Helpers.FieldToUTF8String(message); |
105 | args.Type = (ChatTypeEnum) type; | 105 | args.Type = (ChatTypeEnum) type; |
106 | args.Position = fromPos; | 106 | args.Position = fromPos; |
107 | 107 | ||
@@ -114,7 +114,7 @@ namespace OpenSim.Region.ClientStack | |||
114 | case PacketType.ImprovedInstantMessage: | 114 | case PacketType.ImprovedInstantMessage: |
115 | ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket) Pack; | 115 | ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket) Pack; |
116 | string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName); | 116 | string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName); |
117 | string IMmessage = Util.FieldToString(msgpack.MessageBlock.Message); | 117 | string IMmessage = Helpers.FieldToUTF8String(msgpack.MessageBlock.Message); |
118 | if (OnInstantMessage != null) | 118 | if (OnInstantMessage != null) |
119 | { | 119 | { |
120 | OnInstantMessage(msgpack.AgentData.AgentID, msgpack.AgentData.SessionID, | 120 | OnInstantMessage(msgpack.AgentData.AgentID, msgpack.AgentData.SessionID, |