diff options
| author | Melanie | 2010-01-26 14:44:07 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-26 14:44:07 +0000 |
| commit | 19484891bbe7a8ed9860d386af8d76ac0e0b8974 (patch) | |
| tree | e19c1dde846569ee136a1aa1677d143af925e5e2 /OpenSim/Framework | |
| parent | Fixes Region Crossings on a prim. (diff) | |
| parent | Fix a problem where llDie() calls were sometimes leaving dead objects behind. (diff) | |
| download | opensim-SC_OLD-19484891bbe7a8ed9860d386af8d76ac0e0b8974.zip opensim-SC_OLD-19484891bbe7a8ed9860d386af8d76ac0e0b8974.tar.gz opensim-SC_OLD-19484891bbe7a8ed9860d386af8d76ac0e0b8974.tar.bz2 opensim-SC_OLD-19484891bbe7a8ed9860d386af8d76ac0e0b8974.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Console/RemoteConsole.cs | 6 |
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 | ||