aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-12-03 06:33:13 +0000
committerMelanie Thielker2008-12-03 06:33:13 +0000
commit0d5d3e0b48bbcbb4d18c3a61c9e33f19a9fc17ed (patch)
tree666b2e42bcea7c60f2b12ff230d4358d03f6a412 /OpenSim
parentMake a couple log4net instances static readonly. (diff)
downloadopensim-SC_OLD-0d5d3e0b48bbcbb4d18c3a61c9e33f19a9fc17ed.zip
opensim-SC_OLD-0d5d3e0b48bbcbb4d18c3a61c9e33f19a9fc17ed.tar.gz
opensim-SC_OLD-0d5d3e0b48bbcbb4d18c3a61c9e33f19a9fc17ed.tar.bz2
opensim-SC_OLD-0d5d3e0b48bbcbb4d18c3a61c9e33f19a9fc17ed.tar.xz
Reinstate closing the EQ when the UDP circuit disconnects. This will likely
also reinstate the texture issue, which needs ot be fixed another way.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs15
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
index 122cec7..6d3391a 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
@@ -93,15 +93,12 @@ namespace OpenSim.Region.Environment.Modules.Framework
93 93
94 scene.EventManager.OnNewClient += OnNewClient; 94 scene.EventManager.OnNewClient += OnNewClient;
95 95
96 // TODO: we should really close out something when we 96 // TODO: Leaving these open, or closing them when we
97 // leave the region, but not doing the close actually 97 // become a child is incorrect. It messes up TP in a big
98 // fixes the A -> B -> A teleport bug where you don't 98 // way. CAPS/EQ need to be active as long as the UDP
99 // get any textures. This means we're leaving more in 99 // circuit is there.
100 // memory than we should, but it does provide a better 100
101 // user experience. 101 scene.EventManager.OnClientClosed += ClientClosed;
102
103 // scene.EventManager.OnClientClosed += ClientClosed;
104 // scene.EventManager.OnRemovePresence += ClientClosed;
105 scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel; 102 scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
106 scene.EventManager.OnMakeChildAgent += MakeChildAgent; 103 scene.EventManager.OnMakeChildAgent += MakeChildAgent;
107 scene.EventManager.OnRegisterCaps += OnRegisterCaps; 104 scene.EventManager.OnRegisterCaps += OnRegisterCaps;