diff options
| author | Melanie | 2010-02-22 03:00:59 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-22 03:00:59 +0000 |
| commit | 1f45e6c6497e05638f014e92098165befbbea100 (patch) | |
| tree | 0e4fdd96ef3d3727fc051a9f81375bfbaf0b04f4 /OpenSim/Framework/Console/RemoteConsole.cs | |
| parent | One more test running. (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.zip opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.tar.gz opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.tar.bz2 opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.tar.xz | |
Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Console/RemoteConsole.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index 9fdd1b8..6f8348d 100644 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs | |||
| @@ -302,9 +302,9 @@ namespace OpenSim.Framework.Console | |||
| 302 | if (!UUID.TryParse(post["ID"].ToString(), out id)) | 302 | if (!UUID.TryParse(post["ID"].ToString(), out id)) |
| 303 | return reply; | 303 | return reply; |
| 304 | 304 | ||
| 305 | lock(m_Connections) | 305 | lock (m_Connections) |
| 306 | { | 306 | { |
| 307 | if(!m_Connections.ContainsKey(id)) | 307 | if (!m_Connections.ContainsKey(id)) |
| 308 | return reply; | 308 | return reply; |
| 309 | } | 309 | } |
| 310 | 310 | ||