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/Framework | |
| 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/Framework')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 1e1dfa8..f8be9ad 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -944,7 +944,6 @@ namespace OpenSim.Framework | |||
| 944 | void SetDebugPacketLevel(int newDebug); | 944 | void SetDebugPacketLevel(int newDebug); |
| 945 | 945 | ||
| 946 | void InPacket(object NewPack); | 946 | void InPacket(object NewPack); |
| 947 | void ProcessPendingPackets(); | ||
| 948 | void ProcessInPacket(Packet NewPack); | 947 | void ProcessInPacket(Packet NewPack); |
| 949 | void Close(); | 948 | void Close(); |
| 950 | void Close(bool sendStop); | 949 | void Close(bool sendStop); |