diff options
| author | Kitto Flora | 2010-01-03 23:10:01 -0500 |
|---|---|---|
| committer | Kitto Flora | 2010-01-03 23:10:01 -0500 |
| commit | 253e2ed699a899b74451ac51ed7875b3f98ffdd7 (patch) | |
| tree | 8760330fd19b8ae367b79dd63408b33618c4eff2 /OpenSim/Region/ScriptEngine/XEngine | |
| parent | Vehicle Linear parameter adjustments (diff) | |
| parent | Solve conflict (diff) | |
| download | opensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.zip opensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.gz opensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.bz2 opensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index c831c69..d65107e 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -659,7 +659,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 659 | 659 | ||
| 660 | Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap; | 660 | Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap; |
| 661 | 661 | ||
| 662 | lock(m_ScriptErrors) | 662 | lock (m_ScriptErrors) |
| 663 | { | 663 | { |
| 664 | try | 664 | try |
| 665 | { | 665 | { |