diff options
Diffstat (limited to 'OpenSim/Client')
-rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Client/MXP/MXPModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs index fb0aaa5..bb9b623 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs | |||
@@ -286,7 +286,7 @@ namespace OpenSim.Client.Linden | |||
286 | { | 286 | { |
287 | foreach (Scene nextScene in m_scenes) | 287 | foreach (Scene nextScene in m_scenes) |
288 | { | 288 | { |
289 | if (nextScene.RegionInfo.RegionName == regionName) | 289 | if (nextScene.RegionInfo.RegionName.Equals(regionName, StringComparison.InvariantCultureIgnoreCase)) |
290 | { | 290 | { |
291 | scene = nextScene; | 291 | scene = nextScene; |
292 | return true; | 292 | return true; |
diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs index 2d28b8c..a6b0396 100644 --- a/OpenSim/Client/MXP/MXPModule.cs +++ b/OpenSim/Client/MXP/MXPModule.cs | |||
@@ -52,10 +52,10 @@ namespace OpenSim.Client.MXP | |||
52 | 52 | ||
53 | private IConfigSource m_config; | 53 | private IConfigSource m_config; |
54 | private int m_port = 1253; | 54 | private int m_port = 1253; |
55 | private Timer m_ticker; | ||
55 | 56 | ||
56 | private readonly Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); | 57 | private readonly Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); |
57 | private readonly Timer m_ticker = new Timer(100); | 58 | private bool m_shutdown; |
58 | private bool m_shutdown = false; | ||
59 | 59 | ||
60 | public void Initialise(Scene scene, IConfigSource source) | 60 | public void Initialise(Scene scene, IConfigSource source) |
61 | { | 61 | { |
@@ -78,6 +78,7 @@ namespace OpenSim.Client.MXP | |||
78 | 78 | ||
79 | m_server = new MXPPacketServer(m_port, m_scenes,m_config.Configs["StandAlone"].GetBoolean("accounts_authenticate",true)); | 79 | m_server = new MXPPacketServer(m_port, m_scenes,m_config.Configs["StandAlone"].GetBoolean("accounts_authenticate",true)); |
80 | 80 | ||
81 | m_ticker = new Timer(100); | ||
81 | m_ticker.AutoReset = false; | 82 | m_ticker.AutoReset = false; |
82 | m_ticker.Elapsed += ticker_Elapsed; | 83 | m_ticker.Elapsed += ticker_Elapsed; |
83 | 84 | ||
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs index ba9c653..63381a4 100644 --- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs +++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | |||
@@ -85,10 +85,7 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
85 | 85 | ||
86 | m_transmitter = new Transmitter(port); | 86 | m_transmitter = new Transmitter(port); |
87 | 87 | ||
88 | m_clientThread = new Thread(StartListener); | 88 | StartListener(); |
89 | m_clientThread.Name = "MXPThread"; | ||
90 | m_clientThread.IsBackground = true; | ||
91 | m_clientThread.Start(); | ||
92 | } | 89 | } |
93 | 90 | ||
94 | public void StartListener() | 91 | public void StartListener() |