diff options
| author | Melanie | 2010-02-08 15:53:20 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-08 15:53:38 +0000 |
| commit | baaf660511214e52ea4ed20b8e80ec8e1ff06a3a (patch) | |
| tree | 1e90c7a22ea3354d6bfd5d2b3f8f64f199dbd477 /OpenSim/Client | |
| parent | Added missing configs to Standalone.ini (diff) | |
| parent | Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched (diff) | |
| download | opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.zip opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.gz opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.bz2 opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.xz | |
Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
Diffstat (limited to 'OpenSim/Client')
| -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 821aea2..2098625 100644 --- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs +++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | |||
| @@ -56,7 +56,7 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
| 56 | private readonly Dictionary<UUID, Scene> m_scenes; | 56 | private readonly Dictionary<UUID, Scene> m_scenes; |
| 57 | private readonly Transmitter m_transmitter; | 57 | private readonly Transmitter m_transmitter; |
| 58 | 58 | ||
| 59 | private readonly Thread m_clientThread; | 59 | // private readonly Thread m_clientThread; |
| 60 | 60 | ||
| 61 | private readonly IList<Session> m_sessions = new List<Session>(); | 61 | private readonly IList<Session> m_sessions = new List<Session>(); |
| 62 | private readonly IList<Session> m_sessionsToClient = new List<Session>(); | 62 | private readonly IList<Session> m_sessionsToClient = new List<Session>(); |