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/World | |
| 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/World')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 |
1 files changed, 0 insertions, 4 deletions
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 | } |