diff options
author | Melanie | 2010-11-05 14:27:14 +0100 |
---|---|---|
committer | Melanie | 2010-11-05 14:27:14 +0100 |
commit | f985775962ae8da0010cc5ef5f903a53b550f5d2 (patch) | |
tree | 53c9233ad397080143f9e2087fdfb7b79e67e5b5 /OpenSim/Region/OptionalModules | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-f985775962ae8da0010cc5ef5f903a53b550f5d2.zip opensim-SC_OLD-f985775962ae8da0010cc5ef5f903a53b550f5d2.tar.gz opensim-SC_OLD-f985775962ae8da0010cc5ef5f903a53b550f5d2.tar.bz2 opensim-SC_OLD-f985775962ae8da0010cc5ef5f903a53b550f5d2.tar.xz |
Revert "Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready."
This reverts commit 91b1d17e5bd3ff6ed006744bc529b53a67af1a64.
Conflicts:
OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 96c3d8e..276e46d 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -877,10 +877,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
877 | 877 | ||
878 | } | 878 | } |
879 | 879 | ||
880 | public void ProcessPendingPackets() | ||
881 | { | ||
882 | } | ||
883 | |||
884 | public void ProcessInPacket(Packet NewPack) | 880 | public void ProcessInPacket(Packet NewPack) |
885 | { | 881 | { |
886 | 882 | ||
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 737ca1b..39c3364 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -836,10 +836,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
836 | { | 836 | { |
837 | } | 837 | } |
838 | 838 | ||
839 | public void ProcessPendingPackets() | ||
840 | { | ||
841 | } | ||
842 | |||
843 | public void ProcessInPacket(Packet NewPack) | 839 | public void ProcessInPacket(Packet NewPack) |
844 | { | 840 | { |
845 | } | 841 | } |