aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJeff Ames2007-12-13 07:10:32 +0000
committerJeff Ames2007-12-13 07:10:32 +0000
commit83ca8bd178c397c58d13e2a7fd089f2d2998784b (patch)
treeacdbc9926d69b84707c5762e38a248b303ead43f /OpenSim/Region/ClientStack
parentset svn:eol-style (diff)
downloadopensim-SC_OLD-83ca8bd178c397c58d13e2a7fd089f2d2998784b.zip
opensim-SC_OLD-83ca8bd178c397c58d13e2a7fd089f2d2998784b.tar.gz
opensim-SC_OLD-83ca8bd178c397c58d13e2a7fd089f2d2998784b.tar.bz2
opensim-SC_OLD-83ca8bd178c397c58d13e2a7fd089f2d2998784b.tar.xz
Fix for #176 (... doesn't appear in chat bubbles). This also gets the viewer to handle starting/stopping of the typing animation.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs25
1 files changed, 12 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 750226d..653077f 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2095,9 +2095,8 @@ namespace OpenSim.Region.ClientStack
2095 { 2095 {
2096 NeedAck.Add(Pack.Header.Sequence, Pack); 2096 NeedAck.Add(Pack.Header.Sequence, Pack);
2097 } 2097 }
2098 catch (Exception e) // HACKY 2098 catch (Exception) // HACKY
2099 { 2099 {
2100 e.ToString();
2101 // Ignore 2100 // Ignore
2102 // Seems to throw a exception here occasionally 2101 // Seems to throw a exception here occasionally
2103 // of 'duplicate key' despite being locked. 2102 // of 'duplicate key' despite being locked.
@@ -2159,17 +2158,17 @@ namespace OpenSim.Region.ClientStack
2159 // Actually make the byte array and send it 2158 // Actually make the byte array and send it
2160 try 2159 try
2161 { 2160 {
2162 byte[] sendbuffer = Pack.ToBytes(); 2161 byte[] sendbuffer = Pack.ToBytes();
2163 if (Pack.Header.Zerocoded) 2162 if (Pack.Header.Zerocoded)
2164 { 2163 {
2165 byte[] ZeroOutBuffer = new byte[4096]; 2164 byte[] ZeroOutBuffer = new byte[4096];
2166 int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer); 2165 int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
2167 m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, m_circuitCode); 2166 m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, m_circuitCode);
2168 } 2167 }
2169 else 2168 else
2170 { 2169 {
2171 m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, m_circuitCode); 2170 m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, m_circuitCode);
2172 } 2171 }
2173 } 2172 }
2174 catch (Exception e) 2173 catch (Exception e)
2175 { 2174 {