diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
| -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 95f7852..6dd94bb 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -591,7 +591,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 591 | 591 | ||
| 592 | Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap; | 592 | Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap; |
| 593 | 593 | ||
| 594 | lock(m_ScriptErrors) | 594 | lock (m_ScriptErrors) |
| 595 | { | 595 | { |
| 596 | try | 596 | try |
| 597 | { | 597 | { |