diff options
| author | Melanie | 2010-02-04 17:29:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-04 17:29:33 +0000 |
| commit | 776d62b9c610614053ccd30384624e61c7514edf (patch) | |
| tree | 52426c20053987488cec78bd2a22a5639ba776f2 /OpenSim/Client/MXP/PacketHandler | |
| parent | Line endings cleanup (diff) | |
| parent | Revert "change position of OnAttach event firing so that this also happens wh... (diff) | |
| download | opensim-SC_OLD-776d62b9c610614053ccd30384624e61c7514edf.zip opensim-SC_OLD-776d62b9c610614053ccd30384624e61c7514edf.tar.gz opensim-SC_OLD-776d62b9c610614053ccd30384624e61c7514edf.tar.bz2 opensim-SC_OLD-776d62b9c610614053ccd30384624e61c7514edf.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Client/MXP/PacketHandler')
| -rw-r--r-- | OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs index 7d71f18..daf1fb0 100644 --- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs +++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | |||
| @@ -55,7 +55,7 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
| 55 | private readonly Dictionary<UUID, Scene> m_scenes; | 55 | private readonly Dictionary<UUID, Scene> m_scenes; |
| 56 | private readonly Transmitter m_transmitter; | 56 | private readonly Transmitter m_transmitter; |
| 57 | 57 | ||
| 58 | private readonly Thread m_clientThread; | 58 | // private readonly Thread m_clientThread; |
| 59 | 59 | ||
| 60 | private readonly IList<Session> m_sessions = new List<Session>(); | 60 | private readonly IList<Session> m_sessions = new List<Session>(); |
| 61 | private readonly IList<Session> m_sessionsToClient = new List<Session>(); | 61 | private readonly IList<Session> m_sessionsToClient = new List<Session>(); |