aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2010-01-26 14:53:14 +0000
committerMelanie2010-01-26 14:53:14 +0000
commitb80ea002654bd0ab232aee2b0f842be18b8d4edc (patch)
tree35971637efd7ec9cbfaee88bc5ea56edffddfc1b /OpenSim/Framework
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentReplace dome tabs with spaces (diff)
downloadopensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.zip
opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.gz
opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.bz2
opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index c27072c..9fdd1b8 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -302,6 +302,12 @@ 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)
306 {
307 if(!m_Connections.ContainsKey(id))
308 return reply;
309 }
310
305 if (post["COMMAND"] == null || post["COMMAND"].ToString() == String.Empty) 311 if (post["COMMAND"] == null || post["COMMAND"].ToString() == String.Empty)
306 return reply; 312 return reply;
307 313