aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authormingchen2007-07-06 20:40:03 +0000
committermingchen2007-07-06 20:40:03 +0000
commitbc02ddf5231d7731af33cc0aa5dc914cbdeb5ee7 (patch)
treec2034371669c04d1130b6ed0d7309855f2860d8d /OpenSim/Region/ClientStack
parent*Fixed 2 small references to localhost which has some conflicts when resolving. (diff)
downloadopensim-SC-bc02ddf5231d7731af33cc0aa5dc914cbdeb5ee7.zip
opensim-SC-bc02ddf5231d7731af33cc0aa5dc914cbdeb5ee7.tar.gz
opensim-SC-bc02ddf5231d7731af33cc0aa5dc914cbdeb5ee7.tar.bz2
opensim-SC-bc02ddf5231d7731af33cc0aa5dc914cbdeb5ee7.tar.xz
*Fixed several bugs that crashed the viewer and opensim server when logging in on grid mode
*Note: Grid Mode now works in sugilite, but is still unstable **Known bug in which the grid server crashes after being relaunched from a previously create configuration **Crashing of the viewer crashes the OpenSim server which then crashes the grid server -- needs better handling of exceptions **Multiple sims is still untested, but should connect correctly. Moving between the sims may be a different story
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs3
-rw-r--r--OpenSim/Region/ClientStack/ClientViewBase.cs2
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 64856ea..0114fb1 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -41,11 +41,12 @@ namespace OpenSim.Region.ClientStack
41 protected override void ProcessInPacket(Packet Pack) 41 protected override void ProcessInPacket(Packet Pack)
42 { 42 {
43 ack_pack(Pack); 43 ack_pack(Pack);
44 debug = true;
44 if (debug) 45 if (debug)
45 { 46 {
46 if (Pack.Type != PacketType.AgentUpdate) 47 if (Pack.Type != PacketType.AgentUpdate)
47 { 48 {
48 Console.WriteLine(Pack.Type.ToString()); 49 Console.WriteLine("IN: " + Pack.Type.ToString());
49 } 50 }
50 } 51 }
51 52
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index f105978..24c6911 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -71,6 +71,8 @@ namespace OpenSim.Region.ClientStack
71 // Keep track of when this packet was sent out 71 // Keep track of when this packet was sent out
72 Pack.TickCount = Environment.TickCount; 72 Pack.TickCount = Environment.TickCount;
73 73
74 Console.WriteLine("OUT: " + Pack.Type.ToString());
75
74 if (!Pack.Header.Resent) 76 if (!Pack.Header.Resent)
75 { 77 {
76 // Set the sequence number 78 // Set the sequence number